diff --git a/xwords4/android/XWords4/archive/R.java b/xwords4/android/XWords4/archive/R.java index 88303b0eb..2121d2a3b 100644 --- a/xwords4/android/XWords4/archive/R.java +++ b/xwords4/android/XWords4/archive/R.java @@ -1282,6 +1282,7 @@ public final class R { /** */ public static final int invite_sms_desc_fmt=0x7f05021d; + public static final int invite_stays=0x7f0502d7; /** Send invitation using SMS (texting) or via email? Send invitation using NFC (Android diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index b3d3b5c6f..abb65b297 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -539,8 +539,8 @@ greater than one this text is appended to the above. --> \u0020(You are expecting multiple remote players. You don\'t have to invite them all at once, but - the game will not start until everybody has been invited and all - invitations have been accepted.) + this alert will not be dismissed until everybody has been invited + and all invitations have been accepted.) \u0020uOy( era gnitcepxe elpitlum etomer sreyalp. Uoy nod\'t evah ot etivni meht lla ta ,ecno tub - eht emag lliw ton trats litnu ydobyreve sah neeb detivni dna lla - snoitativni evah neeb detpecca.) + siht trela lliw ton eb dessimsid litnu ydobyreve sah neeb detivni + dna lla snoitativni evah neeb detpecca.) @@ -1946,4 +1946,6 @@ od eht emas gniht.\n\nfI( uoy edih eht snottub dna tnaw meht kcab uoy nac elbane meht ni eht Ecnaraeppa noitces fo Ppa sgnittes.) + sIht( golaid lliw yats pu litnu lla + detivni sreyalp evah detcennoc.) diff --git a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml index 8c335257e..cd6493379 100644 --- a/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml +++ b/xwords4/android/XWords4/res_src/values-ca_PS/strings.xml @@ -454,8 +454,8 @@ greater than one this text is appended to the above. --> \u0020(YOU ARE EXPECTING MULTIPLE REMOTE PLAYERS. YOU DON\'T HAVE TO INVITE THEM ALL AT ONCE, BUT - THE GAME WILL NOT START UNTIL EVERYBODY HAS BEEN INVITED AND ALL - INVITATIONS HAVE BEEN ACCEPTED.) + THIS ALERT WILL NOT BE DISMISSED UNTIL EVERYBODY HAS BEEN INVITED + AND ALL INVITATIONS HAVE BEEN ACCEPTED.) @@ -1946,4 +1946,6 @@ DO THE SAME THING.\n\n(IF YOU HIDE THE BUTTONS AND WANT THEM BACK YOU CAN ENABLE THEM IN THE APPEARANCE SECTION OF APP SETTINGS.) + (THIS DIALOG WILL STAY UP UNTIL ALL + INVITED PLAYERS HAVE CONNECTED.) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java index eb53e4fad..92e1f3e4c 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java @@ -465,10 +465,16 @@ public class BoardDelegate extends DelegateBase showInviteChoicesThen( Action.LAUNCH_INVITE_ACTION ); } }; + OnClickListener lstnr2 = new OnClickListener() { + public void onClick( DialogInterface dialog, + int item ) { + finish(); + } + }; dialog = ab.setTitle( R.string.query_title ) .setMessage( "" ) - .setPositiveButton( R.string.button_yes, lstnr ) - .setNegativeButton( R.string.button_no, null ) + .setPositiveButton( R.string.newgame_invite, lstnr ) + .setNegativeButton( R.string.button_close_game, lstnr2 ) .create(); break; @@ -502,9 +508,8 @@ public class BoardDelegate extends DelegateBase ps = getString( R.string.invite_if_nfc ); } } - if ( null != ps ) { - message += "\n\n" + ps; - } + message += "\n\n" + + (null == ps ? getString( R.string.invite_stays ) : ps); ad.setMessage( message ); break; @@ -652,6 +657,8 @@ public class BoardDelegate extends DelegateBase // in case of change... setBackgroundColor(); setKeepScreenOn(); + } else if ( 0 < m_nMissing ) { + showDialog( DlgID.DLG_INVITE ); } } }