diff options
Diffstat (limited to '')
-rw-r--r-- | res/layout/dialog_clear_history.xml | 18 | ||||
-rw-r--r-- | res/menu/conversations.xml | 6 | ||||
-rw-r--r-- | res/values/strings.xml | 5 |
3 files changed, 28 insertions, 1 deletions
diff --git a/res/layout/dialog_clear_history.xml b/res/layout/dialog_clear_history.xml new file mode 100644 index 00000000..789bbae9 --- /dev/null +++ b/res/layout/dialog_clear_history.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="8dp"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/clear_histor_msg" + android:textSize="18sp" + android:paddingBottom="8dp"/> + <CheckBox + android:id="@+id/end_conversation_checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/also_end_conversation"/> +</LinearLayout> diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml index 3dfc12dd..b6e82c40 100644 --- a/res/menu/conversations.xml +++ b/res/menu/conversations.xml @@ -43,7 +43,11 @@ android:orderInCategory="50" android:showAsAction="never" android:title="@string/action_end_conversation"/> - + <item + android:id="@+id/action_clear_history" + android:orderInCategory="60" + android:showAsAction="never" + android:title="@string/action_clear_history"/> <item android:id="@+id/action_accounts" android:orderInCategory="90" diff --git a/res/values/strings.xml b/res/values/strings.xml index edea0f82..c0adec56 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -54,4 +54,9 @@ <string name="send_rejected">rejected</string> <string name="receiving_image">Receiving image file. Please wait…</string> <string name="preparing_image">Preparing image for transmission. Please wait…</string> + <string name="action_clear_history">Clear history</string> + <string name="clear_conversation_history">Clear Conversation history</string> + <string name="clear_histor_msg">Do you want to delete all messages within this Conversation?\n\n<b>Warning:</b> This will not influence messages stored on other devices or servers.</string> + <string name="delete_messages">Delete messages</string> + <string name="also_end_conversation">End this conversations afterwards</string> </resources> |