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

on return from opening a game, select that game after clearing the selection

Browse source
This commit is contained in:
Eric House 2013-11-21 08:00:59 -08:00
parent 8be57116ab
commit ec2fb210be
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java
View file

@ -415,7 +415,7 @@ public class GameListAdapter implements ExpandableListAdapter {
} }
} }
private GameListItem getGameItemFor( long rowid ) protected GameListItem getGameItemFor( long rowid )
{ {
long[] rowids = { rowid }; long[] rowids = { rowid };
GameListItem[] items = new GameListItem[1]; GameListItem[] items = new GameListItem[1];

22
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
View file

@ -131,7 +131,7 @@ public class GamesList extends XWExpandableListActivity
private String m_nameField; private String m_nameField;
private NetLaunchInfo m_netLaunchInfo; private NetLaunchInfo m_netLaunchInfo;
private GameNamer m_namer; private GameNamer m_namer;
private boolean m_gameLaunched = false; private long m_launchedGame = 0;
private boolean m_menuPrepared; private boolean m_menuPrepared;
private HashSet<Long> m_selGames; private HashSet<Long> m_selGames;
private HashSet<Long> m_selGroupIDs; private HashSet<Long> m_selGroupIDs;
@ -409,7 +409,7 @@ public class GamesList extends XWExpandableListActivity
protected void onNewIntent( Intent intent ) protected void onNewIntent( Intent intent )
{ {
super.onNewIntent( intent ); super.onNewIntent( intent );
m_gameLaunched = false; m_launchedGame = 0;
Assert.assertNotNull( intent ); Assert.assertNotNull( intent );
invalRelayIDs( intent.getStringArrayExtra( RELAYIDS_EXTRA ) ); invalRelayIDs( intent.getStringArrayExtra( RELAYIDS_EXTRA ) );
invalRowID( intent.getLongExtra( ROWID_EXTRA, -1 ) ); invalRowID( intent.getLongExtra( ROWID_EXTRA, -1 ) );
@ -465,7 +465,11 @@ public class GamesList extends XWExpandableListActivity
super.onWindowFocusChanged( hasFocus ); super.onWindowFocusChanged( hasFocus );
if ( hasFocus ) { if ( hasFocus ) {
updateField(); updateField();
m_gameLaunched = false;
if ( 0 != m_launchedGame ) {
selectJustLaunched();
m_launchedGame = 0;
}
} }
} }
@ -502,7 +506,7 @@ public class GamesList extends XWExpandableListActivity
// dialog in case it was dismissed. That way it to check for // dialog in case it was dismissed. That way it to check for
// an empty room name. // an empty room name.
if ( clicked instanceof GameListItem ) { if ( clicked instanceof GameListItem ) {
if ( !m_gameLaunched ) { if ( 0 == m_launchedGame ) {
long rowid = ((GameListItem)clicked).getRowID(); long rowid = ((GameListItem)clicked).getRowID();
showNotAgainDlgThen( R.string.not_again_newselect, showNotAgainDlgThen( R.string.not_again_newselect,
R.string.key_notagain_newselect, R.string.key_notagain_newselect,
@ -1240,8 +1244,8 @@ public class GamesList extends XWExpandableListActivity
private void launchGame( long rowid, boolean invited ) private void launchGame( long rowid, boolean invited )
{ {
if ( !m_gameLaunched ) { if ( 0 == m_launchedGame ) {
m_gameLaunched = true; m_launchedGame = rowid;
GameUtils.launchGame( this, rowid, invited ); GameUtils.launchGame( this, rowid, invited );
} }
} }
@ -1331,6 +1335,12 @@ public class GamesList extends XWExpandableListActivity
} }
} }
private void selectJustLaunched()
{
clearSelections();
m_adapter.getGameItemFor( m_launchedGame ).setSelected( true );
}
public static void onGameDictDownload( Context context, Intent intent ) public static void onGameDictDownload( Context context, Intent intent )
{ {
intent.setClass( context, GamesList.class ); intent.setClass( context, GamesList.class );