Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-11 08:48:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

disable new game buttons at same time as corresponding menu items are disabled

Browse source
This commit is contained in:
Eric House 2015-03-04 19:14:53 -08:00
parent fa6c043433
commit 43a5bbacdb
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java
View file

@ -1,6 +1,6 @@
/* -*- compile-command: "find-and-ant.sh debug install"; -*- */ /* -*- compile-command: "find-and-ant.sh debug install"; -*- */
/* /*
* Copyright 2009 - 2014 by Eric House (xwords@eehouse.org). All * Copyright 2009 - 2015 by Eric House (xwords@eehouse.org). All
* rights reserved. * rights reserved.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -577,6 +577,7 @@ public class GamesListDelegate extends ListDelegateBase
private Set<Long> m_selGroupIDs; private Set<Long> m_selGroupIDs;
private String m_origTitle; private String m_origTitle;
private boolean m_nextIsSolo; private boolean m_nextIsSolo;
private Button[] m_newGameButtons;
public GamesListDelegate( ListDelegator delegator, Bundle sis ) public GamesListDelegate( ListDelegator delegator, Bundle sis )
{ {
@ -888,6 +889,11 @@ public class GamesListDelegate extends ListDelegateBase
s_firstShown = true; s_firstShown = true;
} }
m_newGameButtons = new Button[] {
(Button)findViewById( R.id.button_newgame_solo ),
(Button)findViewById( R.id.button_newgame_multi )
};
mkListAdapter(); mkListAdapter();
ListView listView = getListView(); ListView listView = getListView();
listView.setOnItemLongClickListener( this ); listView.setOnItemLongClickListener( this );
@ -987,6 +993,18 @@ public class GamesListDelegate extends ListDelegateBase
// } // }
} }
public void invalidateOptionsMenuIf()
{
super.invalidateOptionsMenuIf();
if ( !XWPrefs.getHideNewgameButtons( m_activity ) ) {
boolean enable = 0 == m_selGames.size() && 1 >= m_selGroupIDs.size();
for ( Button button : m_newGameButtons ) {
button.setEnabled( enable );
}
}
}
protected void onWindowFocusChanged( boolean hasFocus ) protected void onWindowFocusChanged( boolean hasFocus )
{ {
if ( hasFocus ) { if ( hasFocus ) {
@ -1317,7 +1335,7 @@ public class GamesListDelegate extends ListDelegateBase
0 < DBUtils.getGamesWithSendsPending( m_activity ).size(); 0 < DBUtils.getGamesWithSendsPending( m_activity ).size();
Utils.setItemVisible( menu, R.id.games_menu_resend, enable ); Utils.setItemVisible( menu, R.id.games_menu_resend, enable );
m_menuPrepared = true; Assert.assertTrue( m_menuPrepared );
} else { } else {
DbgUtils.logf( "onPrepareOptionsMenu: incomplete so bailing" ); DbgUtils.logf( "onPrepareOptionsMenu: incomplete so bailing" );
} }
@ -1568,10 +1586,9 @@ public class GamesListDelegate extends ListDelegateBase
private void setupButtons() private void setupButtons()
{ {
boolean hidden = XWPrefs.getHideNewgameButtons( m_activity ); boolean hidden = XWPrefs.getHideNewgameButtons( m_activity );
int[] ids = { R.id.button_newgame_solo, R.id.button_newgame_multi };
boolean[] isSolos = { true, false }; boolean[] isSolos = { true, false };
for ( int ii = 0; ii < ids.length; ++ii ) { for ( int ii = 0; ii < m_newGameButtons.length; ++ii ) {
Button button = (Button)findViewById( ids[ii] ); Button button = m_newGameButtons[ii];
if ( hidden ) { if ( hidden ) {
button.setVisibility( View.GONE ); button.setVisibility( View.GONE );
} else { } else {