mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-24 02:25:19 +00:00
c7da83a702
Previously, we'd only show the attachment button when the user had yet to enter any text. To add an attachment after text was entered, you'd have to go to the three-dot menu. Now we just show a little attach button in the text area. I also took the opportunity to clean up other button paddings and stuff in the compose area so things look better and react to text sizes more predictably.
263 lines
13 KiB
XML
263 lines
13 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<org.thoughtcrime.securesms.components.InputPanel
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
android:id="@+id/bottom_panel"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:gravity="center_vertical"
|
|
android:orientation="horizontal"
|
|
android:clickable="true"
|
|
android:paddingLeft="16dp"
|
|
android:paddingRight="16dp"
|
|
android:paddingTop="6dp"
|
|
android:paddingBottom="6dp"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false">
|
|
|
|
<FrameLayout
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false">
|
|
|
|
<LinearLayout
|
|
android:id="@+id/compose_bubble"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:background="?attr/conversation_input_background"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false"
|
|
android:orientation="vertical">
|
|
|
|
<org.thoughtcrime.securesms.components.QuoteView
|
|
android:id="@+id/quote_view"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginLeft="6dp"
|
|
android:layout_marginRight="6dp"
|
|
android:layout_marginTop="6dp"
|
|
android:visibility="gone"
|
|
app:message_type="preview"
|
|
app:quote_colorPrimary="?attr/conversation_item_sent_text_primary_color"
|
|
app:quote_colorSecondary="?attr/conversation_item_sent_text_primary_color"
|
|
tools:visibility="visible"/>
|
|
|
|
<FrameLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false">
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:paddingLeft="10dp"
|
|
android:paddingStart="10dp"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false">
|
|
|
|
<org.thoughtcrime.securesms.components.emoji.EmojiToggle
|
|
android:id="@+id/emoji_toggle"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="@dimen/conversation_compose_height"
|
|
android:layout_gravity="bottom"
|
|
android:paddingLeft="4dp"
|
|
android:paddingStart="4dp"
|
|
android:paddingRight="6dp"
|
|
android:paddingEnd="6dp"
|
|
android:background="?selectableItemBackgroundBorderless"
|
|
android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
|
|
|
|
<Space
|
|
android:layout_width="0dp"
|
|
android:layout_height="@dimen/conversation_compose_height" />
|
|
|
|
<org.thoughtcrime.securesms.components.ComposeText
|
|
style="@style/ComposeEditText"
|
|
android:id="@+id/embedded_text_editor"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center_vertical"
|
|
android:layout_weight="1"
|
|
android:nextFocusForward="@+id/send_button"
|
|
android:nextFocusRight="@+id/send_button"
|
|
tools:visibility="invisible"
|
|
tools:hint="Send TextSecure message" >
|
|
<requestFocus />
|
|
</org.thoughtcrime.securesms.components.ComposeText>
|
|
|
|
<FrameLayout
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false">
|
|
|
|
<org.thoughtcrime.securesms.components.HidingLinearLayout
|
|
android:id="@+id/quick_attachment_toggle"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:layout_gravity="right|end"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false">
|
|
|
|
<ImageButton
|
|
android:id="@+id/quick_camera_toggle"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:layout_gravity="center_vertical"
|
|
android:src="?quick_camera_icon"
|
|
android:paddingLeft="6dp"
|
|
android:paddingRight="6dp"
|
|
android:background="?selectableItemBackgroundBorderless"
|
|
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_camera_description" />
|
|
|
|
<org.thoughtcrime.securesms.components.MicrophoneRecorderView
|
|
android:id="@+id/recorder_view"
|
|
android:layout_height="match_parent"
|
|
android:layout_width="wrap_content"
|
|
android:layout_gravity="center_vertical"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false">
|
|
|
|
<ImageButton
|
|
android:id="@+id/quick_audio_toggle"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:layout_gravity="center_vertical"
|
|
android:layout_marginRight="2dp"
|
|
android:layout_marginEnd="2dp"
|
|
android:padding="6dp"
|
|
android:src="?quick_mic_icon"
|
|
android:background="@null"
|
|
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_record_and_send_audio_description" />
|
|
|
|
<ImageView
|
|
android:id="@+id/quick_audio_fab"
|
|
android:layout_width="74dp"
|
|
android:layout_height="74dp"
|
|
android:src="@drawable/ic_mic_white_48dp"
|
|
android:background="@drawable/circle_tintable"
|
|
android:backgroundTint="@color/core_red"
|
|
android:visibility="gone"
|
|
android:scaleType="center"/>
|
|
|
|
</org.thoughtcrime.securesms.components.MicrophoneRecorderView>
|
|
|
|
</org.thoughtcrime.securesms.components.HidingLinearLayout>
|
|
|
|
<org.thoughtcrime.securesms.components.HidingLinearLayout
|
|
android:id="@+id/inline_attachment_container"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:layout_gravity="right|end">
|
|
|
|
<ImageButton
|
|
android:id="@+id/inline_attachment_button"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="@dimen/conversation_compose_height"
|
|
android:layout_gravity="bottom"
|
|
android:padding="8dp"
|
|
android:src="@drawable/ic_add_white_24dp"
|
|
android:tint="?attr/conversation_input_inline_attach_icon_tint"
|
|
android:background="?selectableItemBackgroundBorderless"/>
|
|
|
|
</org.thoughtcrime.securesms.components.HidingLinearLayout>
|
|
|
|
</FrameLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/recording_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center_vertical"
|
|
android:gravity="center_vertical"
|
|
android:orientation="horizontal"
|
|
tools:visibility="gone">
|
|
|
|
<TextView
|
|
android:id="@+id/record_time"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:ellipsize="none"
|
|
android:layout_marginLeft="20dp"
|
|
android:layout_marginStart="20dp"
|
|
style="@style/Signal.Text.Body"
|
|
android:text="00:00"
|
|
android:textColor="@color/core_light_60"
|
|
android:singleLine="true"
|
|
android:visibility="gone"
|
|
tools:visibility="visible"/>
|
|
|
|
<FrameLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:clipChildren="true">
|
|
|
|
<TextView
|
|
android:id="@+id/slide_to_cancel"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:gravity="left|start|center_vertical"
|
|
android:drawableLeft="@drawable/ic_keyboard_arrow_left_grey600_24dp"
|
|
android:drawableStart="@drawable/ic_keyboard_arrow_left_grey600_24dp"
|
|
style="@style/Signal.Text.Caption"
|
|
android:text="@string/conversation_input_panel__slide_to_cancel"
|
|
android:textAllCaps="true"
|
|
android:textColor="@color/core_light_60"
|
|
android:ellipsize="none"
|
|
android:visibility="gone"
|
|
android:paddingRight="50dp"
|
|
android:paddingEnd="50dp"
|
|
tools:visibility="visible"/>
|
|
|
|
</FrameLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
</FrameLayout>
|
|
|
|
</LinearLayout>
|
|
|
|
</FrameLayout>
|
|
|
|
<org.thoughtcrime.securesms.components.AnimatingToggle
|
|
android:id="@+id/button_toggle"
|
|
android:layout_width="@dimen/conversation_compose_height"
|
|
android:layout_height="@dimen/conversation_compose_height"
|
|
android:layout_marginLeft="12dp"
|
|
android:layout_marginStart="12dp"
|
|
android:background="@drawable/circle_tintable"
|
|
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/circle_touch_highlight_background"
|
|
android:src="@drawable/ic_add_white_24dp"
|
|
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:paddingTop="6dp"
|
|
android:paddingRight="6dp"
|
|
android:paddingBottom="6dp"
|
|
android:paddingLeft="11dp"
|
|
android:scaleType="fitCenter"
|
|
android:contentDescription="@string/conversation_activity__send"
|
|
android:nextFocusLeft="@+id/embedded_text_editor"
|
|
android:src="?conversation_transport_sms_indicator"
|
|
android:background="@drawable/circle_touch_highlight_background" />
|
|
|
|
</org.thoughtcrime.securesms.components.AnimatingToggle>
|
|
</org.thoughtcrime.securesms.components.InputPanel>
|