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

change "resign" menu text once game is over

Browse source
This commit is contained in:
Eric House 2012-10-08 07:09:44 -07:00
parent e64ecfb78d
commit ce58750b92
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
View file

@ -140,6 +140,7 @@ public class BoardActivity extends XWActivity
private BoardUtilCtxt m_utils; private BoardUtilCtxt m_utils;
private int m_nMissingPlayers = -1; private int m_nMissingPlayers = -1;
private int m_invitesPending; private int m_invitesPending;
private boolean m_gameOver = false;
// call startActivityForResult synchronously // call startActivityForResult synchronously
private Semaphore m_forResultWait = new Semaphore(0); private Semaphore m_forResultWait = new Semaphore(0);
@ -650,6 +651,12 @@ public class BoardActivity extends XWActivity
item.setEnabled( null == m_gsi || m_gsi.curTurnSelected ); item.setEnabled( null == m_gsi || m_gsi.curTurnSelected );
} }
if ( m_gameOver || DBUtils.gameOver( this, m_rowid ) ) {
m_gameOver = true;
item = menu.findItem( R.id.board_menu_game_resign );
item.setTitle( R.string.board_menu_game_final );
}
return true; return true;
} }
@ -1494,6 +1501,7 @@ public class BoardActivity extends XWActivity
@Override @Override
public void notifyGameOver() public void notifyGameOver()
{ {
m_gameOver = true;
m_jniThread.handle( JNIThread.JNICmd.CMD_POST_OVER ); m_jniThread.handle( JNIThread.JNICmd.CMD_POST_OVER );
} }

5
xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
View file

@ -421,6 +421,11 @@ public class DBUtils {
return 0 == getInt( context, rowid, DBHelper.CONTRACTED, 0 ); return 0 == getInt( context, rowid, DBHelper.CONTRACTED, 0 );
} }
public static boolean gameOver( Context context, long rowid )
{
return 0 != getInt( context, rowid, DBHelper.GAME_OVER, 0 );
}
public static String getRelayID( Context context, long rowid ) public static String getRelayID( Context context, long rowid )
{ {
String result = null; String result = null;