aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-01-04 17:27:51 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-01-04 17:27:54 +0100
commit501034fe0eb267f5100f4dd799fb1454fe7ba1a4 (patch)
treef3a676567c49f99e6bb103095951cdcae1f686d4 /src/main/res
parentfdb6b0e30d7cc5a90e4bad181ddc89acf4a2e4fa (diff)
Allow entering a JID from 'choose contact'. thanks @singpolyma
fixes #1611 fixes #1602
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/enter_jid_dialog.xml (renamed from src/main/res/layout/create_contact_dialog.xml)0
-rw-r--r--src/main/res/menu/choose_contact.xml10
-rw-r--r--src/main/res/values/strings.xml2
3 files changed, 10 insertions, 2 deletions
diff --git a/src/main/res/layout/create_contact_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml
index 6333e340..6333e340 100644
--- a/src/main/res/layout/create_contact_dialog.xml
+++ b/src/main/res/layout/enter_jid_dialog.xml
diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml
index c025d00f..94b6479b 100644
--- a/src/main/res/menu/choose_contact.xml
+++ b/src/main/res/menu/choose_contact.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/action_search"
@@ -8,4 +8,10 @@
android:showAsAction="collapseActionView|always"
android:title="@string/search"/>
-</menu> \ No newline at end of file
+ <item
+ android:id="@+id/action_create_contact"
+ android:icon="?attr/icon_add_person"
+ android:showAsAction="always"
+ android:title="@string/create_contact"
+ android:visible="false"/>
+</menu>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 1035ff83..3e4d2c68 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -226,12 +226,14 @@
<string name="conferences">Conferences</string>
<string name="search">Search</string>
<string name="create_contact">Create Contact</string>
+ <string name="enter_contact">Enter Contact</string>
<string name="join_conference">Join Conference</string>
<string name="delete_contact">Delete Contact</string>
<string name="view_contact_details">View contact details</string>
<string name="block_contact">Block contact</string>
<string name="unblock_contact">Unblock contact</string>
<string name="create">Create</string>
+ <string name="select">Select</string>
<string name="contact_already_exists">The contact already exists</string>
<string name="join">Join</string>
<string name="conference_address">Conference address</string>