diff options
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/message_error.xml | 54 | ||||
-rw-r--r-- | res/layout/message_recieved.xml | 9 | ||||
-rw-r--r-- | res/layout/message_sent.xml | 9 |
3 files changed, 18 insertions, 54 deletions
diff --git a/res/layout/message_error.xml b/res/layout/message_error.xml deleted file mode 100644 index 410e1b05..00000000 --- a/res/layout/message_error.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="8dp"> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/message_border" - android:layout_toRightOf="@+id/message_photo" - android:layout_alignParentBottom="true" - android:minHeight="48dp" - > -<LinearLayout - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:orientation="vertical" - android:background="#ededed" - android:padding="5dp"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Username is already in use" - android:textSize="16sp" - android:id="@+id/message_body" - android:textColor="#e92727" - android:textStyle="bold" - android:typeface="monospace"/> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="1dp" - android:text="@string/sending" - android:textColor="#8e8e8e" - android:textSize="12sp" - android:id="@+id/message_time"/> - - </LinearLayout> -</LinearLayout> - <ImageView - android:id="@+id/message_photo" - android:layout_width="48dp" - android:layout_height="48dp" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:layout_marginRight="-1.5dp" - android:padding="0dp" - android:src="@drawable/ic_profile" - android:scaleType="fitXY"/> - -</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/message_recieved.xml b/res/layout/message_recieved.xml index 65a9cd29..32a26c3a 100644 --- a/res/layout/message_recieved.xml +++ b/res/layout/message_recieved.xml @@ -21,6 +21,15 @@ android:orientation="vertical" android:padding="5dp" > + <ImageView + android:id="@+id/message_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:adjustViewBounds="true" + android:maxHeight="288dp" + android:maxWidth="288dp" + /> + <TextView android:id="@+id/message_body" android:layout_width="wrap_content" diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml index 7d2cb8d7..7b56b231 100644 --- a/res/layout/message_sent.xml +++ b/res/layout/message_sent.xml @@ -19,6 +19,15 @@ android:background="#ededed" android:orientation="vertical" android:padding="5dp" > + + <ImageView + android:id="@+id/message_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:adjustViewBounds="true" + android:maxHeight="288dp" + android:maxWidth="288dp" + /> <TextView android:id="@+id/message_body" |