aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-17 00:03:37 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-17 00:03:37 +0200
commit38a9242955704232039272fd8b6011d47622495d (patch)
tree16665564834041b3c1218531d548449e64285f8d /res
parent670dead69502884d178ab60ec10e8e0e7b7a7915 (diff)
brought muc invites back. + couple of bug fixes + refactoring
Diffstat (limited to 'res')
-rw-r--r--res/layout/activity_choose_contact.xml13
-rw-r--r--res/layout/activity_muc_details.xml4
-rw-r--r--res/menu/choose_contact.xml10
-rw-r--r--res/menu/conversations.xml37
-rw-r--r--res/values/strings.xml6
5 files changed, 42 insertions, 28 deletions
diff --git a/res/layout/activity_choose_contact.xml b/res/layout/activity_choose_contact.xml
new file mode 100644
index 000000000..248a7822c
--- /dev/null
+++ b/res/layout/activity_choose_contact.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <ListView
+ android:id="@+id/choose_contact_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:listitem="@layout/contact" />
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml
index d47c6b6ef..49b4cef3a 100644
--- a/res/layout/activity_muc_details.xml
+++ b/res/layout/activity_muc_details.xml
@@ -63,7 +63,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:text="hallo hallo"
android:textColor="@color/primarytext"
android:textSize="18sp" />
@@ -72,7 +71,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:text="Participant"
android:textColor="@color/primarytext"
android:textSize="14sp" />
</LinearLayout>
@@ -123,7 +121,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="24dp"
- android:text="@string/invite_contacts" />
+ android:text="@string/invite_contact" />
</LinearLayout>
</ScrollView> \ No newline at end of file
diff --git a/res/menu/choose_contact.xml b/res/menu/choose_contact.xml
new file mode 100644
index 000000000..3f402664a
--- /dev/null
+++ b/res/menu/choose_contact.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item
+ android:id="@+id/action_search"
+ android:actionLayout="@layout/actionview_search"
+ android:icon="@drawable/ic_action_search"
+ android:showAsAction="collapseActionView|always"
+ android:title="@string/search"/>
+</menu> \ No newline at end of file
diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml
index 710a552e4..2621289a5 100644
--- a/res/menu/conversations.xml
+++ b/res/menu/conversations.xml
@@ -2,47 +2,44 @@
<item
android:id="@+id/action_add"
- android:orderInCategory="10"
android:icon="@drawable/ic_action_new"
+ android:orderInCategory="10"
android:showAsAction="always"
- android:title="@string/action_add" />
-
+ android:title="@string/action_add"/>
<item
android:id="@+id/action_security"
+ android:icon="@drawable/ic_action_not_secure"
android:orderInCategory="20"
android:showAsAction="always"
- android:icon="@drawable/ic_action_not_secure"
- android:title="@string/action_secure" />
-
+ android:title="@string/action_secure"/>
<item
android:id="@+id/action_attach_file"
+ android:icon="@drawable/ic_action_new_attachment"
android:orderInCategory="30"
android:showAsAction="always"
- android:icon="@drawable/ic_action_new_attachment"
- android:title="@string/attach_file" />
-
+ android:title="@string/attach_file"/>
<item
android:id="@+id/action_contact_details"
android:orderInCategory="40"
android:showAsAction="never"
- android:title="@string/action_contact_details" />
- <item
+ android:title="@string/action_contact_details"/>
+ <item
android:id="@+id/action_muc_details"
+ android:icon="@drawable/ic_action_group"
android:orderInCategory="40"
android:showAsAction="ifRoom"
- android:icon="@drawable/ic_action_group"
- android:title="@string/action_muc_details" />
- <item
+ android:title="@string/action_muc_details"/>
+ <item
android:id="@+id/action_invite"
+ android:orderInCategory="45"
android:showAsAction="never"
- android:title="@string/invite_contacts" />
-
+ android:title="@string/invite_contact"/>
<item
android:id="@+id/action_archive"
android:orderInCategory="50"
android:showAsAction="never"
android:title="@string/action_end_conversation"/>
- <item
+ <item
android:id="@+id/action_clear_history"
android:orderInCategory="60"
android:showAsAction="never"
@@ -51,13 +48,11 @@
android:id="@+id/action_accounts"
android:orderInCategory="90"
android:showAsAction="never"
- android:title="@string/action_accounts"
- />
-
+ android:title="@string/action_accounts"/>
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:showAsAction="never"
android:title="@string/action_settings"/>
-</menu>
+</menu> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 26e5dda5a..8cfff3684 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -47,10 +47,7 @@
<string name="show_otr_key">OTR fingerprint</string>
<string name="no_otr_fingerprint">No OTR Fingerprint generated. Just go ahead an start an encrypted conversation</string>
<string name="start_conversation">Start Conversation</string>
- <string name="invite_contacts">Invite Contacts</string>
- <string name="invite_contacts_to_existing">Invite to existing conference</string>
- <string name="new_conference">Create new conference</string>
- <string name="new_contact">Create new contact</string>
+ <string name="invite_contact">Invite Contact</string>
<string name="contacts">Contacts</string>
<string name="search_jabber_id">Search or enter Jabber ID</string>
<string name="choose_account">Choose account</string>
@@ -272,4 +269,5 @@
<string name="bookmark_already_exists">This bookmark already exists</string>
<string name="you">You</string>
<string name="action_edit_subject">Edit conference subject</string>
+ <string name="title_activity_choose_contact">Choose contact</string>
</resources>