diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-02-11 21:20:51 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-02-11 21:20:51 +0100 |
| commit | 73084c9cd30dacb6228a0851efa928aaeabcb229 (patch) | |
| tree | 894754dbba9d3a7339fbaf8032422c13b08b30eb /src/main/res/layout | |
| parent | f7abd4237f0b8441fcba45459e26b8a0ea1d36de (diff) | |
Fixed XML errors after merge
Diffstat (limited to 'src/main/res/layout')
| -rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 4 | ||||
| -rw-r--r-- | src/main/res/layout/message_received.xml | 6 | ||||
| -rw-r--r-- | src/main/res/layout/message_sent.xml | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index cde94087..9f040676 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -1,6 +1,6 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:emojicon="http://schemas.android.com/apk/res-auto" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" @@ -88,7 +88,7 @@ android:text="This is a placeholder text to show the last messages" android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" - emojicon:emojiconSize="20sp" /> + app:emojiconSize="20sp" /> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/conversation_lastimage" diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index 389b0f48..b68cc532 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:emojicon="http://schemas.android.com/apk/res-auto" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -34,7 +34,7 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="fill_parent" - android:background="@color/primarybackground" + android:background="@color/primaryBackground" android:gravity="center_vertical" android:orientation="vertical" android:padding="2dp"> @@ -58,7 +58,7 @@ android:textColor="@color/white" android:textColorHighlight="@color/grey800" android:textSize="?attr/TextSizeBody" - emojicon:emojiconSize="28sp" /> + app:emojiconSize="28sp" /> <Button android:id="@+id/download_button" diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index d75f4bdb..58511f25 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:emojicon="http://schemas.android.com/apk/res-auto" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -49,7 +49,7 @@ android:background="@color/primaryText" android:scaleType="centerCrop" /> - <TextView + <github.ankushsachdeva.emojicon.EmojiconTextView android:id="@+id/message_body" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -57,7 +57,8 @@ android:textColorLink="@color/primaryText" android:textColor="@color/primaryText" android:textColorHighlight="@color/grey500" - android:textSize="?attr/TextSizeBody" /> + android:textSize="?attr/TextSizeBody" + app:emojiconSize="28sp"/> <Button android:id="@+id/download_button" |