From 7c3f3b2a3e878b1b1cfdcca102a38efe033dc6b7 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Fri, 4 Jul 2014 14:22:17 +0200 Subject: [PATCH] added group add button --- res/menu/start_conversation.xml | 34 +++++++++++-------- res/values/strings.xml | 3 +- .../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 4c59f482e..89ba675a1 100644 --- a/res/menu/start_conversation.xml +++ b/res/menu/start_conversation.xml @@ -1,27 +1,31 @@ - - - + + + + - + android:title="@string/action_accounts"/> - + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 9662ee493..a2d04e96f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -258,4 +258,5 @@ Conferences Search Create Contact - + Create Conference + \ 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 16161e36f..ba6038197 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; }