aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--res/drawable-hdpi/ic_received_indicator.pngbin0 -> 686 bytes
-rw-r--r--res/drawable-mdpi/ic_received_indicator.pngbin0 -> 447 bytes
-rw-r--r--res/drawable-xhdpi/ic_received_indicator.pngbin0 -> 855 bytes
-rw-r--r--res/drawable-xxhdpi/ic_received_indicator.pngbin0 -> 1236 bytes
-rw-r--r--res/layout/message_sent.xml12
-rw-r--r--res/values-de/strings.xml5
-rw-r--r--res/values/strings.xml3
-rw-r--r--res/xml/preferences.xml9
8 files changed, 26 insertions, 3 deletions
diff --git a/res/drawable-hdpi/ic_received_indicator.png b/res/drawable-hdpi/ic_received_indicator.png
new file mode 100644
index 00000000..b1e3f274
--- /dev/null
+++ b/res/drawable-hdpi/ic_received_indicator.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_received_indicator.png b/res/drawable-mdpi/ic_received_indicator.png
new file mode 100644
index 00000000..88ff1efb
--- /dev/null
+++ b/res/drawable-mdpi/ic_received_indicator.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_received_indicator.png b/res/drawable-xhdpi/ic_received_indicator.png
new file mode 100644
index 00000000..2c871933
--- /dev/null
+++ b/res/drawable-xhdpi/ic_received_indicator.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_received_indicator.png b/res/drawable-xxhdpi/ic_received_indicator.png
new file mode 100644
index 00000000..039a9ef9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_received_indicator.png
Binary files differ
diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml
index 9728dc56..cb35093d 100644
--- a/res/layout/message_sent.xml
+++ b/res/layout/message_sent.xml
@@ -64,6 +64,16 @@
android:textSize="?attr/TextSizeInfo" />
<ImageView
+ android:id="@+id/indicator_received"
+ android:layout_width="?attr/TextSizeInfo"
+ android:layout_height="?attr/TextSizeInfo"
+ android:layout_gravity="center_vertical"
+ android:layout_marginLeft="6sp"
+ android:layout_marginTop="2sp"
+ android:gravity="center_vertical"
+ android:src="@drawable/ic_received_indicator" />
+
+ <ImageView
android:id="@+id/security_indicator"
android:layout_width="?attr/TextSizeInfo"
android:layout_height="?attr/TextSizeInfo"
@@ -87,4 +97,4 @@
android:scaleType="fitXY"
android:src="@drawable/ic_profile" />
-</RelativeLayout> \ No newline at end of file
+</RelativeLayout>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1dbfdf10..9b76c94b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -232,6 +232,8 @@
<string name="additional_information">Zusätzliche Informationen</string>
<string name="skip">Überspringen</string>
<string name="pref_ui_options">Benutzeroberfläche</string>
+ <string name="pref_use_indicate_received">Anfrage für Nachrichten Empfang</string>
+ <string name="pref_use_indicate_received_summary">Wenn Nachricht vom Empfänger empfangen wurde dann erscheint ein Häckchen als Bestätigung (muss vom Client des Empfängers unterstützt werden und funktioniert nicht in jedem Fall)</string>
<string name="disable_notifications">Benachrichtigungen deaktivieren</string>
<string name="disable_notifications_for_this_conversation">Benachrichtigungen für diese Unterhaltung deaktivieren</string>
<string name="notifications_disabled">Benachrichtigungen sind deaktiviert</string>
@@ -256,5 +258,6 @@
<string name="pref_use_larger_font_summary">Überall in der App eine größere Schrift verwenden</string>
<string name="pref_use_send_button_to_indicate_status">Absende-Knopf zeigt Online-Status an</string>
<string name="pref_use_send_button_to_indicate_status_summary">Absende-Knopf einfärben, um den Online-Status des Kontakts zu signalisieren</string>
+ <string name="pref_expert_options_other">Anderes - nicht kategorisiert</string>
-</resources> \ No newline at end of file
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c3e465ac..22d617f8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -255,6 +255,9 @@
<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>
<string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
+ <string name="pref_use_indicate_received">Request message receipts</string>
+ <string name="pref_use_indicate_received_summary">When message has been received by the receiver then a tick will appear as confirmation (must supported by the recipient client and does not work as any case)</string>
<string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string>
+ <string name="pref_expert_options_other">Other - not categorized</string>
</resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 7d0886bc..3dab0959 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -90,6 +90,13 @@
android:summary="@string/pref_dont_save_encrypted_summary"
android:title="@string/pref_dont_save_encrypted" />
</PreferenceCategory>
+ <PreferenceCategory android:title="@string/pref_expert_options_other" >
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="indicate_received"
+ android:summary="@string/pref_use_indicate_received_summary"
+ android:title="@string/pref_use_indicate_received" />
+ </PreferenceCategory>
</PreferenceScreen>
<CheckBoxPreference
@@ -99,4 +106,4 @@
android:title="@string/pref_never_send_crash" />
</PreferenceCategory>
-</PreferenceScreen> \ No newline at end of file
+</PreferenceScreen>