Merge branch 'trz/rename' into trz/rebase

5 files changed, 25 insertions, 1 deletions

diff --git a/src/main/res/drawable-hdpi/ic_toast.png b/src/main/res/drawable-hdpi/ic_toast.png
new file mode 100644
index 00000000..fd5d1d8b
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_toast.png
diff --git a/src/main/res/drawable-hdpi/ic_toast_error.png b/src/main/res/drawable-hdpi/ic_toast_error.png
new file mode 100644
index 00000000..31de0901
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_toast_error.png
diff --git a/src/main/res/layout/cplus_toast_container.xml b/src/main/res/layout/cplus_toast_container.xml
new file mode 100644
index 00000000..f2aa09e3
--- /dev/null
+++ b/src/main/res/layout/cplus_toast_container.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/cplus_toast"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="8dp"
+    android:background="#DAAA">
+
+    <ImageView android:id="@+id/cplus_toast_icon"
+        android:src="@drawable/ic_toast"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="8dp"/>
+
+    <TextView android:id="@+id/cplus_toast_txt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#FFF"
+        android:shadowColor="#BB000000"
+        android:shadowRadius="2.75"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index f59c51f3..8bda9c8f 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -117,7 +117,7 @@
                 android:textColor="@color/secondaryText"
                 android:textSize="?attr/TextSizeInfo"
                 android:visibility="gone"
-                android:textStyle="italic"/>
+                android:textStyle="normal|italic"/>
         </LinearLayout>
     </LinearLayout>
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 5200fcb9..eb6800e0 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -682,4 +682,6 @@
 	<string name="file_not_on_remote_host">No file on remote host</string>
 	<string name="dlg_msg_details_original_filename">Original Filename</string>
     <string name="cplus_open">Open</string>
+	<string name="cplus_remote_file_delete_service_unavailable">Remote File Deletion Service currently unavailable. Please try again later.</string>
+	<string name="cplus_remote_file_delete_failed">Failed to delete remote file.</string>
 </resources>