narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

added group add button

Browse source
This commit is contained in:
iNPUTmice 2014-07-04 14:22:17 +02:00
parent c1ee9e682a
commit 7c3f3b2a3e
3 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
res/menu/start_conversation.xml
View file

@ -1,27 +1,31 @@
<?xml version="1.0" encoding="utf-8"?> <?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/search"
android:title="@string/search" <item
android:icon="@drawable/ic_action_search" android:id="@+id/action_search"
android:showAsAction="collapseActionView|ifRoom" android:actionViewClass="android.widget.SearchView"
android:actionViewClass="android.widget.SearchView" /> android:icon="@drawable/ic_action_search"
android:showAsAction="collapseActionView|ifRoom"
<item android:id="@+id/create_contact" android:title="@string/search"/>
android:title="@string/create_contact" <item
android:icon="@drawable/ic_action_add_person" android:id="@+id/action_create_contact"
android:showAsAction="ifRoom" 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 <item
android:id="@+id/action_accounts" android:id="@+id/action_accounts"
android:orderInCategory="90" android:orderInCategory="90"
android:showAsAction="never" android:showAsAction="never"
android:title="@string/action_accounts" android:title="@string/action_accounts"/>
/>
<item <item
android:id="@+id/action_settings" android:id="@+id/action_settings"
android:orderInCategory="100" android:orderInCategory="100"
android:showAsAction="never" android:showAsAction="never"
android:title="@string/action_settings"/> android:title="@string/action_settings"/>
</menu> </menu>

3
res/values/strings.xml
View file

@ -258,4 +258,5 @@
<string name="conferences">Conferences</string> <string name="conferences">Conferences</string>
<string name="search">Search</string> <string name="search">Search</string>
<string name="create_contact">Create Contact</string> <string name="create_contact">Create Contact</string>
</resources> <string name="create_conference">Create Conference</string>
</resources>

13
src/eu/siacs/conversations/ui/StartConversation.java
View file

@ -9,12 +9,8 @@ import android.app.ListFragment;
import android.os.Bundle; import android.os.Bundle;
import android.support.v13.app.FragmentPagerAdapter; import android.support.v13.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View;
import android.widget.PopupMenu;
import android.widget.PopupMenu.OnMenuItemClickListener;
import eu.siacs.conversations.R; import eu.siacs.conversations.R;
public class StartConversation extends XmppActivity { public class StartConversation extends XmppActivity {
@ -36,6 +32,7 @@ public class StartConversation extends XmppActivity {
@Override @Override
public void onTabSelected(Tab tab, FragmentTransaction ft) { public void onTabSelected(Tab tab, FragmentTransaction ft) {
mViewPager.setCurrentItem(tab.getPosition()); mViewPager.setCurrentItem(tab.getPosition());
invalidateOptionsMenu();
} }
@Override @Override
@ -49,6 +46,7 @@ public class StartConversation extends XmppActivity {
@Override @Override
public void onPageSelected(int position) { public void onPageSelected(int position) {
getActionBar().setSelectedNavigationItem(position); getActionBar().setSelectedNavigationItem(position);
invalidateOptionsMenu();
} }
}; };
@ -91,6 +89,13 @@ public class StartConversation extends XmppActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.start_conversation, 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; return true;
} }