diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-hdpi/ic_action_new_attachment.png | bin | 0 -> 648 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_action_new_attachment.png | bin | 0 -> 468 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_action_new_attachment.png | bin | 0 -> 789 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/ic_action_new_attachment.png | bin | 0 -> 1112 bytes | |||
| -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 | ||||
| -rw-r--r-- | res/menu/conversations.xml | 7 | ||||
| -rw-r--r-- | res/values/arrays.xml | 12 | ||||
| -rw-r--r-- | res/values/strings.xml | 7 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 12 |
11 files changed, 55 insertions, 55 deletions
diff --git a/res/drawable-hdpi/ic_action_new_attachment.png b/res/drawable-hdpi/ic_action_new_attachment.png Binary files differnew file mode 100644 index 00000000..28507da2 --- /dev/null +++ b/res/drawable-hdpi/ic_action_new_attachment.png diff --git a/res/drawable-mdpi/ic_action_new_attachment.png b/res/drawable-mdpi/ic_action_new_attachment.png Binary files differnew file mode 100644 index 00000000..33058655 --- /dev/null +++ b/res/drawable-mdpi/ic_action_new_attachment.png diff --git a/res/drawable-xhdpi/ic_action_new_attachment.png b/res/drawable-xhdpi/ic_action_new_attachment.png Binary files differnew file mode 100644 index 00000000..4948feec --- /dev/null +++ b/res/drawable-xhdpi/ic_action_new_attachment.png diff --git a/res/drawable-xxhdpi/ic_action_new_attachment.png b/res/drawable-xxhdpi/ic_action_new_attachment.png Binary files differnew file mode 100644 index 00000000..78553886 --- /dev/null +++ b/res/drawable-xxhdpi/ic_action_new_attachment.png 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" diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml index 5902e74f..3dfc12dd 100644 --- a/res/menu/conversations.xml +++ b/res/menu/conversations.xml @@ -15,6 +15,13 @@ android:title="@string/action_secure" /> <item + android:id="@+id/action_attach_file" + android:orderInCategory="30" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_action_new_attachment" + android:title="@string/action_attach_file" /> + + <item android:id="@+id/action_contact_details" android:orderInCategory="40" android:showAsAction="ifRoom" diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 2210fbb8..09fd3cc7 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -7,4 +7,16 @@ <item>Conversations</item> <item>Android</item> </array> + <string-array name="filesizes"> + <item>never</item> + <item>256 KB</item> + <item>512 KB</item> + <item>1 MB</item> + </string-array> + <string-array name="filesizes_values"> + <item>0</item> + <item>262144</item> + <item>524288</item> + <item>1048576</item> + </string-array> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 9d1b42ac..209f484c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -21,7 +21,7 @@ <string name="participant">Participant</string> <string name="visitor">Visitor</string> <string name="enter_new_name">Enter a new name:</string> - <string name="remove_contact_text">Do you want to delete %s from your roster. The conversation assoziated with this account will not be removed.</string> + <string name="remove_contact_text">Do you want to delete %s from your roster. The conversation associated with this account will not be removed.</string> <string name="untrusted_cert_hint">The server %s presented you with an untrusted, possible self signed, certificate.</string> <string name="account_info">Server Info</string> <string name="register_account">Register new account on server</string> @@ -47,4 +47,9 @@ <string name="problem_connecting_to_account">Unable to connect to account</string> <string name="problem_connecting_to_accounts">Unable to connect to multiple accounts</string> <string name="touch_to_fix">Touch here to manage your accounts</string> + <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> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 2202a6df..6268350a 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -15,6 +15,13 @@ android:entries="@array/resources" android:entryValues="@array/resources" android:defaultValue="Mobile"/> + <ListPreference + android:key="auto_accept_file_size" + android:title="Accept files" + android:summary="Automatically accept files smaller than" + android:entries="@array/filesizes" + android:entryValues="@array/filesizes_values" + android:defaultValue="524288"/> </PreferenceCategory> <PreferenceCategory android:title="Notification Settings"> @@ -41,6 +48,11 @@ android:key="notify_in_conversation_when_highlighted" android:title="Conference notification" android:summary="Always notify when a new conference message arrives instead of only when highlighted"/> + <CheckBoxPreference + android:key="notification_grace_period_after_carbon_received" + android:title="Notification grace period" + android:summary="Disable notifications for a short time after a carbon copy was received" + android:defaultValue="true"/> </PreferenceCategory> <PreferenceCategory android:title="UI Options"> |
