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

remove warning about setting room name

Browse source
This commit is contained in:
Eric House 2020-08-26 21:28:00 -07:00
parent 15f95b52a9
commit f9ceacdfa7
3 changed files with 3 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
View file

@ -111,7 +111,6 @@ public class GameConfigDelegate extends DelegateBase
private CommonPrefs m_cp; private CommonPrefs m_cp;
private boolean m_gameStarted = false; private boolean m_gameStarted = false;
private String[] m_connStrings; private String[] m_connStrings;
private boolean m_nameWarningShown = false;
private HashMap<CommsConnType, boolean[]> m_disabMap; private HashMap<CommsConnType, boolean[]> m_disabMap;
private static final int[] s_disabledWhenLocked private static final int[] s_disabledWhenLocked
= { R.id.juggle_players, = { R.id.juggle_players,
@ -521,8 +520,6 @@ public class GameConfigDelegate extends DelegateBase
.getSpinner(); .getSpinner();
m_connLabel = (TextView)findViewById( R.id.conns_label ); m_connLabel = (TextView)findViewById( R.id.conns_label );
findViewById( R.id.room_edit ).setOnClickListener(this);
} // init } // init
@Override @Override
@ -862,14 +859,6 @@ public class GameConfigDelegate extends DelegateBase
saveAndClose( false ); saveAndClose( false );
} }
break; break;
case R.id.room_edit:
if ( ! m_nameWarningShown ) {
m_nameWarningShown = true;
makeNotAgainBuilder( R.string.not_again_warnRoomName,
R.string.key_na_warnRoomName )
.show();
}
break;
default: default:
Log.w( TAG, "unknown v: " + view.toString() ); Log.w( TAG, "unknown v: " + view.toString() );
Assert.failDbg(); Assert.failDbg();

1
xwords4/android/app/src/main/res/values/common_rsrc.xml
View file

@ -159,7 +159,6 @@
<string name="key_na_dupstatus_host">key_na_dupstatus_host</string> <string name="key_na_dupstatus_host">key_na_dupstatus_host</string>
<string name="key_na_dupstatus_guest">key_na_dupstatus_guest</string> <string name="key_na_dupstatus_guest">key_na_dupstatus_guest</string>
<string name="key_na_warnRoomName">key_na_warnRoomName</string>
<!-- Nor is my email address --> <!-- Nor is my email address -->
<string name="email_author_email">xwords@eehouse.org</string> <string name="email_author_email">xwords@eehouse.org</string>

23
xwords4/android/app/src/main/res/values/strings.xml
View file

@ -1392,26 +1392,9 @@
<!-- Shown in the Game configure screen when the game_locked <!-- Shown in the Game configure screen when the game_locked
checkbox is checked and you uncheck it. --> checkbox is checked and you uncheck it. -->
<string name="not_again_unlock">This game is in play. Some <string name="not_again_unlock">This game is in play. Some
settings, e.g. the number of players, cannot be changed without settings, e.g. the number of players, cannot be changed without
restarting it. When you leave this page you will have a chance restarting it. When you leave this page you will have a chance to
to discard changes to avoid a restart.</string> discard changes to avoid a restart.</string>
<!-- shown in the game configure screen the first time user taps
on the room name edit field. -->
<string name="not_again_warnRoomName">
Changing the room name? If you’re doing that to connect to an
existing game you should know that there’s a better way: have
the person who created the game send you an invitation. (She
will be prompted to send an invitation whenever she opens a game
that’s missing any players.)
\n\nIf you just want to have a cool room name, no problem!
\n\nAnd, if you still want to connect by setting room names
manually, try to keep the games open on both devices until you
see tiles appear.
\n\n(I am working on fixing this...)
</string>
<!-- This is shown in the Board screen when you successfully <!-- This is shown in the Board screen when you successfully
connect a game to the relay and are the first device in the connect a game to the relay and are the first device in the