aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-10-23 21:27:41 +0200
committeriNPUTmice <daniel@gultsch.de>2014-10-23 21:27:41 +0200
commitd73a77643d7923cae0789c5ed9f6a2a4cf41385f (patch)
tree14012cf90146a8a1feacd29cbc6fa6ad959ba1c2 /res
parentde3739970b32a927d8c1ec5f7a378fa50c4b4f99 (diff)
context menu for messages. allow to resend single messages
Diffstat (limited to 'res')
-rw-r--r--res/layout/message_received.xml4
-rw-r--r--res/layout/message_sent.xml4
-rw-r--r--res/menu/message_context.xml17
-rw-r--r--res/values/strings.xml19
4 files changed, 35 insertions, 9 deletions
diff --git a/res/layout/message_received.xml b/res/layout/message_received.xml
index 730d00d5..39bb842a 100644
--- a/res/layout/message_received.xml
+++ b/res/layout/message_received.xml
@@ -15,7 +15,8 @@
android:layout_alignParentBottom="true"
android:layout_toRightOf="@+id/message_photo"
android:background="@drawable/message_border"
- android:minHeight="48dp" >
+ android:minHeight="48dp"
+ android:longClickable="true">
<LinearLayout
android:layout_width="wrap_content"
@@ -43,7 +44,6 @@
android:layout_height="wrap_content"
android:autoLink="web"
android:textColor="@color/primarytext"
- android:textIsSelectable="true"
android:textSize="?attr/TextSizeBody" />
<Button
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index e3e9b673..3e854643 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -15,7 +15,8 @@
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@+id/message_photo"
android:background="@drawable/message_border"
- android:minHeight="48dp" >
+ android:minHeight="48dp"
+ android:longClickable="true">
<LinearLayout
android:layout_width="wrap_content"
@@ -43,7 +44,6 @@
android:layout_height="wrap_content"
android:autoLink="web"
android:textColor="@color/primarytext"
- android:textIsSelectable="true"
android:textSize="?attr/TextSizeBody" />
<Button
diff --git a/res/menu/message_context.xml b/res/menu/message_context.xml
new file mode 100644
index 00000000..23d5d28d
--- /dev/null
+++ b/res/menu/message_context.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/copy_text"
+ android:title="@string/copy_text"/>
+ <item
+ android:id="@+id/share_image"
+ android:title="@string/share_image"/>
+ <item
+ android:id="@+id/copy_url"
+ android:title="@string/copy_original_url" />
+ <item
+ android:id="@+id/send_again"
+ android:title="@string/send_again"/>
+
+</menu> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3862bb7b..0170b006 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -249,10 +249,10 @@
<string name="pref_force_encryption">Force end-to-end encryption</string>
<string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string>
<string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
- <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
- <string name="pref_enable_legacy_ssl">Enable legacy SSL</string>
- <string name="pref_enable_legacy_ssl_summary">Enables SSLv3 support for legacy servers. Warning: SSLv3 is considered insecure.</string>
- <string name="pref_expert_options">Expert options</string>
+ <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
+ <string name="pref_enable_legacy_ssl">Enable legacy SSL</string>
+ <string name="pref_enable_legacy_ssl_summary">Enables SSLv3 support for legacy servers. Warning: SSLv3 is considered insecure.</string>
+ <string name="pref_expert_options">Expert options</string>
<string name="pref_expert_options_summary">Please be careful with these</string>
<string name="pref_use_larger_font">Increase font size</string>
<string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
@@ -272,5 +272,14 @@
<string name="image_file_deleted">The image file has been deleted</string>
<string name="not_connected_try_again">You are not connected. Try again later</string>
<string name="check_image_filesize">Check image file size</string>
+ <string name="message_options">Message options</string>
+ <string name="copy_text">Copy text</string>
+ <string name="share_image">Share image</string>
+ <string name="copy_original_url">Copy original URL</string>
+ <string name="send_again">Send again</string>
+ <string name="image_url">Image URL</string>
+ <string name="message_text">Message text</string>
+ <string name="url_copied_to_clipboard">URL copied to clipboard</string>
+ <string name="message_copied_to_clipboard">Message copied to clipboard</string>
-</resources>
+</resources> \ No newline at end of file