blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bottom align the emoji toggle and send toggle. 

Fixes #2891
Closes #3191

// FREEBIE
master
Michael Herbig 2015-05-18 21:26:09 -04:00 committed by Moxie Marlinspike
parent 4aa4ab50c4
commit 01bebf2176
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
res/drawable-v21/touch_highlight_background.xml 100644
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/touch_highlight">
<item
android:id="@android:id/mask"
android:drawable="@android:color/white" />
</ripple>

12
res/layout/conversation_activity.xml
View File

@ -70,8 +70,8 @@
<org.thoughtcrime.securesms.components.emoji.EmojiToggle
android:id="@+id/emoji_toggle"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@drawable/touch_highlight_background"
android:contentDescription="@string/conversation_activity__emoji_toggle_description"
android:padding="10dp"/>
@ -100,11 +100,12 @@
<org.thoughtcrime.securesms.components.AnimatingToggle
android:id="@+id/button_toggle"
android:layout_width="46dp"
android:layout_height="44dp">
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_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/touch_highlight_background"
android:src="?conversation_attach"
@ -114,8 +115,7 @@
<org.thoughtcrime.securesms.components.SendButton
android:id="@+id/send_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_height="wrap_content"
android:background="@drawable/touch_highlight_background"
android:contentDescription="@string/conversation_activity__send"
android:nextFocusLeft="@+id/embedded_text_editor"