diff options
| -rw-r--r-- | res/menu/start_conversation.xml | 34 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/ui/StartConversation.java | 13 |
3 files changed, 30 insertions, 20 deletions
diff --git a/res/menu/start_conversation.xml b/res/menu/start_conversation.xml index 4c59f482..89ba675a 100644 --- a/res/menu/start_conversation.xml +++ b/res/menu/start_conversation.xml @@ -1,27 +1,31 @@ <?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_search" + android:actionViewClass="android.widget.SearchView" + android:icon="@drawable/ic_action_search" + android:showAsAction="collapseActionView|ifRoom" + android:title="@string/search"/> + <item + android:id="@+id/action_create_contact" + android:icon="@drawable/ic_action_add_person" + android:showAsAction="ifRoom" + android:title="@string/create_contact"/> + <item + android:id="@+id/action_create_conference" + android:icon="@drawable/ic_action_add_group" + android:showAsAction="ifRoom" + android:title="@string/create_conference"/> <item 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 9662ee49..a2d04e96 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -258,4 +258,5 @@ <string name="conferences">Conferences</string> <string name="search">Search</string> <string name="create_contact">Create Contact</string> -</resources> + <string name="create_conference">Create Conference</string> +</resources>
\ No newline at end of file diff --git a/src/eu/siacs/conversations/ui/StartConversation.java b/src/eu/siacs/conversations/ui/StartConversation.java index 16161e36..ba603819 100644 --- a/src/eu/siacs/conversations/ui/StartConversation.java +++ b/src/eu/siacs/conversations/ui/StartConversation.java @@ -9,12 +9,8 @@ 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 { @@ -36,6 +32,7 @@ public class StartConversation extends XmppActivity { @Override public void onTabSelected(Tab tab, FragmentTransaction ft) { mViewPager.setCurrentItem(tab.getPosition()); + invalidateOptionsMenu(); } @Override @@ -49,6 +46,7 @@ public class StartConversation extends XmppActivity { @Override public void onPageSelected(int position) { getActionBar().setSelectedNavigationItem(position); + invalidateOptionsMenu(); } }; @@ -91,6 +89,13 @@ public class StartConversation extends XmppActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.start_conversation, menu); + MenuItem menuCreateContact = (MenuItem) menu.findItem(R.id.action_create_contact); + MenuItem menuCreateConference = (MenuItem) menu.findItem(R.id.action_create_conference); + if (getActionBar().getSelectedNavigationIndex() == 0) { + menuCreateConference.setVisible(false); + } else { + menuCreateContact.setVisible(false); + } return true; } |