aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-04 11:36:02 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-10 00:53:43 +0200
commitc1ee9e682a2f825e72260deb3f1c8579e21ed8de (patch)
tree8e6e7cf6858ca0097a0281621ede36dcd835d873
parent502a1bdb9c3f6ddb8cdcf9be8c20862f4d55feaf (diff)
added action bar menu to start conversation
-rw-r--r--res/menu/start_conversation.xml27
-rw-r--r--res/values/strings.xml2
-rw-r--r--src/eu/siacs/conversations/ui/StartConversation.java21
3 files changed, 50 insertions, 0 deletions
diff --git a/res/menu/start_conversation.xml b/res/menu/start_conversation.xml
new file mode 100644
index 00000000..4c59f482
--- /dev/null
+++ b/res/menu/start_conversation.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item android:id="@+id/search"
+ android:title="@string/search"
+ android:icon="@drawable/ic_action_search"
+ android:showAsAction="collapseActionView|ifRoom"
+ android:actionViewClass="android.widget.SearchView" />
+
+ <item android:id="@+id/create_contact"
+ android:title="@string/create_contact"
+ android:icon="@drawable/ic_action_add_person"
+ android:showAsAction="ifRoom"
+ />
+ <item
+ android:id="@+id/action_accounts"
+ android:orderInCategory="90"
+ android:showAsAction="never"
+ android:title="@string/action_accounts"
+ />
+
+ <item
+ android:id="@+id/action_settings"
+ android:orderInCategory="100"
+ android:showAsAction="never"
+ android:title="@string/action_settings"/>
+
+</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 78961a56..9662ee49 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -256,4 +256,6 @@
<string name="verify">Verify</string>
<string name="decrypt">Decrypt</string>
<string name="conferences">Conferences</string>
+ <string name="search">Search</string>
+ <string name="create_contact">Create Contact</string>
</resources>
diff --git a/src/eu/siacs/conversations/ui/StartConversation.java b/src/eu/siacs/conversations/ui/StartConversation.java
index 9dccb411..16161e36 100644
--- a/src/eu/siacs/conversations/ui/StartConversation.java
+++ b/src/eu/siacs/conversations/ui/StartConversation.java
@@ -9,6 +9,12 @@ import android.app.ListFragment;
import android.os.Bundle;
import android.support.v13.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.PopupMenu;
+import android.widget.PopupMenu.OnMenuItemClickListener;
import eu.siacs.conversations.R;
public class StartConversation extends XmppActivity {
@@ -81,6 +87,21 @@ public class StartConversation extends XmppActivity {
});
}
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.start_conversation, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ default:
+ break;
+ }
+ return super.onOptionsItemSelected(item);
+ }
@Override
void onBackendConnected() {