Skip to content

Commit

Permalink
Fix reply bar UI (#594)
Browse files Browse the repository at this point in the history
Signed-off-by: Daniele Ricci <daniele@casaricci.it>
  • Loading branch information
daniele-athome committed Nov 27, 2017
1 parent 41b2017 commit acaf4ab
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
3 changes: 2 additions & 1 deletion app/src/main/res/layout/compose_message.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@

<org.kontalk.ui.view.ReplyBar android:id="@+id/reply_bar"
android:layout_width="fill_parent"
android:layout_height="@dimen/reply_bar_height"
android:layout_height="wrap_content"
android:minHeight="@dimen/reply_bar_height"
android:padding="8dp"
android:background="?attr/colorBackgroundFloating"
app:dividerView="@+id/reply_bar_divider"
Expand Down
13 changes: 6 additions & 7 deletions app/src/main/res/layout/reply_bar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,17 @@
<ImageView android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/text"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:src="@drawable/ic_menu_reply"
android:tint="?attr/colorPrimaryDark"
tools:ignore="ContentDescription"/>
tools:ignore="ContentDescription" />

<TextView
android:id="@+id/sender"
<TextView android:id="@+id/sender"
style="@style/TextAppearance.ReplyBar.Sender"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -59,10 +58,10 @@
android:layout_toStartOf="@+id/btn_cancel"
android:autoLink="none"
android:ellipsize="end"
android:lines="1"
android:maxLines="3"
android:linksClickable="false"
app:emojiSize="@dimen/emoji_textview_size"
tools:text="Hey man any plans for tonight?"/>
tools:text="Hey man any plans for tonight? I thought about lorem ipsum, it was very easy to get, you should try this with multiline text!!"/>

<ImageView android:id="@+id/btn_cancel"
android:contentDescription="@string/btn_reply_cancel_description"
Expand All @@ -72,6 +71,6 @@
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"/>
android:layout_alignBottom="@+id/text" />

</merge>

0 comments on commit acaf4ab

Please sign in to comment.