TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 12:05:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix composition bar disappearing

Browse Source 
Closes #3846
// FREEBIE
This commit is contained in:
Jake McGinty 2015-07-30 13:20:21 -07:00 committed by Moxie Marlinspike
parent 964171b26a
commit b5318ed248
1 changed files with 71 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
res/layout/conversation_activity.xml
View File

@ -27,48 +27,43 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" /> android:layout_weight="1" />
<LinearLayout android:id="@+id/bottom_container" <FrameLayout android:id="@+id/attachment_editor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:paddingTop="10dp"
android:visibility="gone">
<org.thoughtcrime.securesms.components.ThumbnailView
android:id="@+id/attachment_thumbnail"
android:layout_width="230dp"
android:layout_height="150dp"
android:contentDescription="@string/conversation_activity__attachment_thumbnail"
app:backgroundColorHint="?conversation_background" />
<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>
<LinearLayout android:id="@+id/bottom_panel"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:gravity="center_vertical"
android:orientation="horizontal"
android:clickable="true"
android:padding="5dp">
<FrameLayout <LinearLayout android:id="@+id/compose_bubble"
android:id="@+id/attachment_editor" android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:paddingTop="10dp"
android:visibility="gone">
<org.thoughtcrime.securesms.components.ThumbnailView
android:id="@+id/attachment_thumbnail"
android:layout_width="230dp"
android:layout_height="150dp"
android:contentDescription="@string/conversation_activity__attachment_thumbnail"
app:backgroundColorHint="?conversation_background" />
<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>
<LinearLayout android:id="@+id/bottom_panel"
android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:layout_weight="1"
android:orientation="horizontal" android:background="@drawable/sent_bubble">
android:padding="5dp">
<LinearLayout android:id="@+id/compose_bubble" <org.thoughtcrime.securesms.components.emoji.EmojiToggle
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/sent_bubble">
<org.thoughtcrime.securesms.components.emoji.EmojiToggle
android:id="@+id/emoji_toggle" android:id="@+id/emoji_toggle"
android:layout_width="37dp" android:layout_width="37dp"
android:layout_height="37dp" android:layout_height="37dp"
@ -76,7 +71,7 @@
android:background="@drawable/touch_highlight_background" android:background="@drawable/touch_highlight_background"
android:contentDescription="@string/conversation_activity__emoji_toggle_description" /> android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
<org.thoughtcrime.securesms.components.ComposeText <org.thoughtcrime.securesms.components.ComposeText
style="@style/ComposeEditText" style="@style/ComposeEditText"
android:id="@+id/embedded_text_editor" android:id="@+id/embedded_text_editor"
android:layout_width="0dp" android:layout_width="0dp"
@ -88,35 +83,34 @@
android:nextFocusRight="@+id/send_button" android:nextFocusRight="@+id/send_button"
tools:hint="Send TextSecure message" /> tools:hint="Send TextSecure message" />
<org.thoughtcrime.securesms.components.camera.HidingImageButton <org.thoughtcrime.securesms.components.camera.HidingImageButton
android:id="@+id/quick_attachment_toggle" android:id="@+id/quick_attachment_toggle"
android:layout_width="37dp" android:layout_width="37dp"
android:layout_height="37dp" android:layout_height="37dp"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:src="?quick_camera_icon" android:src="?quick_camera_icon"
android:background="@drawable/touch_highlight_background" android:background="@drawable/touch_highlight_background"
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_description" android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_description"
android:padding="10dp" /> android:padding="10dp" />
</LinearLayout> </LinearLayout>
<org.thoughtcrime.securesms.components.AnimatingToggle <org.thoughtcrime.securesms.components.AnimatingToggle
android:id="@+id/button_toggle" android:id="@+id/button_toggle"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:background="@drawable/circle_tintable" android:background="@drawable/circle_tintable"
android:layout_gravity="bottom"> android:layout_gravity="bottom">
<ImageButton <ImageButton android:id="@+id/attach_button"
android:id="@+id/attach_button" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_height="match_parent" android:layout_gravity="center"
android:layout_gravity="center" android:background="@drawable/circle_touch_highlight_background"
android:background="@drawable/circle_touch_highlight_background" android:src="@drawable/ic_attach_white_24dp"
android:src="@drawable/ic_attach_white_24dp" android:contentDescription="@string/ConversationActivity_add_attachment"
android:contentDescription="@string/ConversationActivity_add_attachment" android:nextFocusLeft="@+id/embedded_text_editor" />
android:nextFocusLeft="@+id/embedded_text_editor" />
<org.thoughtcrime.securesms.components.SendButton <org.thoughtcrime.securesms.components.SendButton
android:id="@+id/send_button" android:id="@+id/send_button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -125,30 +119,30 @@
android:src="?conversation_transport_sms_indicator" android:src="?conversation_transport_sms_indicator"
android:background="@drawable/circle_touch_highlight_background" /> android:background="@drawable/circle_touch_highlight_background" />
</org.thoughtcrime.securesms.components.AnimatingToggle> </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> </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)" />
<org.thoughtcrime.securesms.components.emoji.EmojiDrawer <org.thoughtcrime.securesms.components.emoji.EmojiDrawer
android:id="@+id/emoji_drawer" android:id="@+id/emoji_drawer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
</org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer> </org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer>