Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

add state summaries for BT games too

Browse source
This commit is contained in:
Eric House 2012-02-03 17:09:59 -08:00
parent 8793d8f4fd
commit cebb002fd0
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/XWords4/res/values/strings.xml
View file

@ -1849,4 +1849,8 @@
<string name="scan_progress">Scanning for Crosswords on paired devices</string>
<string name="invite_progress">Sending new game info...</string>
<string name="summary_bt_wait">Not yet connected</string>
<string name="summary_bt_gameover">Game over</string>
<string name="summary_bt_conn">Game in play</string>
</resources>

21
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/GameSummary.java
View file

@ -25,6 +25,8 @@ import android.text.TextUtils;
import junit.framework.Assert;
import org.eehouse.android.xw4.R;
import org.eehouse.android.xw4.Utils;
import org.eehouse.android.xw4.DbgUtils;
import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
/** Info we want to access when the game's closed that's not available
@ -45,7 +47,7 @@ public class GameSummary {
public int[] scores;
public boolean gameOver;
public String[] players;
public CommsAddrRec.CommsConnType conType;
public CommsConnType conType;
public String smsPhone;
// relay-related fields
public String roomName;
@ -148,9 +150,9 @@ public class GameSummary {
{
String result = null;
if ( isMultiGame() ) {
if ( CommsAddrRec.CommsConnType.COMMS_CONN_RELAY == conType ) {
int fmtID;
int fmtID = 0;
switch ( conType ) {
case COMMS_CONN_RELAY:
if ( null == relayID || 0 == relayID.length() ) {
fmtID = R.string.summary_relay_conff;
} else if ( anyMissing() ) {
@ -161,6 +163,17 @@ public class GameSummary {
fmtID = R.string.summary_relay_connf;
}
result = String.format( m_context.getString(fmtID), roomName );
break;
case COMMS_CONN_BT:
if ( anyMissing() ) {
fmtID = R.string.summary_bt_wait;
} else if ( gameOver ) {
fmtID = R.string.summary_bt_gameover;
} else {
fmtID = R.string.summary_bt_conn;
}
result = m_context.getString( fmtID );
break;
}
}
return result;