diff options
| author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-11 09:13:56 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-11 09:13:56 +0200 |
| commit | 51100ab48b94c55f8cce981c422e50a607f261ad (patch) | |
| tree | f23ad4ad4e8256dd0db7deca347364bbdc76a295 /res | |
| parent | 644473205ab261157f500470d496999db665d75f (diff) | |
failed messages get now marked inline
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/message_error.xml | 54 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 2 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/values/strings.xml b/res/values/strings.xml index d93d8243..20b2c60a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -50,4 +50,6 @@ <string name="action_attach_file">Attach file</string> <string name="not_in_roster">The contact is not in your roster. Would you like to add it?</string> <string name="add_contact">Add contact</string> + <string name="send_failed">unsuccessful delivery</string> + <string name="send_rejected">rejected</string> </resources> |