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

UI change: networked games are no longer allowed to have per-player

Browse source 
dicts.  Now you select a single dict for such games in a new spinner
just below the lang spinner, and player's dicts are no longer
displayed.  For standalone games, the single dict choice isn't there,
the individual dicts are displayed, and you must open a player config
to change the dict as before.  The idea is that this will be less
confusing, particularly when I need to tell the guest that the host is
using a different dict.
This commit is contained in:
Eric House 2012-10-14 19:21:27 -07:00
parent 4cf595e939
commit c811282591
3 changed files with 72 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xwords4/android/XWords4/res/layout/game_config.xml
View file

@ -50,7 +50,7 @@
>
<TextView style="@style/config_separator"
android:text="@string/lang_label"
android:id="@+id/lang_separator"
/>
<Spinner android:id="@+id/lang_spinner"
@ -59,6 +59,12 @@
android:drawSelectorOnTop="true"
android:prompt="@string/title_langs_list"
/>
<Spinner android:id="@+id/dict_spinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:drawSelectorOnTop="true"
android:layout_marginLeft="20sp"
/>
<!-- players -->
<TextView style="@style/config_separator"

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

@ -351,8 +351,12 @@
<!-- text of button to juggle (randomly rearrange order of) players -->
<string name="button_juggle_players">Shuffle players</string>
<!-- text of separator marking out the language area of the dialog -->
<!-- text of separator marking out the language area of the
dialog. First is used for single-device games, and second
for networked games (where players aren't allowed to have
different wordlists.) -->
<string name="lang_label">Game language</string>
<string name="langdict_label">Game language/wordlist</string>
<!-- text of separator marking out the connection area of the dialog -->
<string name="connect_label_relay">Connection (via internet)</string>

84
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java
View file

@ -85,6 +85,7 @@ public class GameConfig extends XWActivity
private ImageButton m_refreshRoomsButton;
private View m_connectSetRelay;
private View m_connectSetSMS;
private Spinner m_dictSpinner;
private Spinner m_roomChoose;
// private Button m_configureButton;
private long m_rowid;
@ -105,8 +106,8 @@ public class GameConfig extends XWActivity
private CommsAddrRec[] m_remoteAddrs;
private CommsAddrRec m_car;
private CommonPrefs m_cp;
private boolean m_canDoSMS = false;
private boolean m_canDoBT = false;
// private boolean m_canDoSMS = false;
// private boolean m_canDoBT = false;
private boolean m_gameStarted = false;
private CommsConnType[] m_types;
private String[] m_connStrings;
@ -313,11 +314,20 @@ public class GameConfig extends XWActivity
Utils.setText( dialog, R.id.password_edit, lp.password );
// Dicts spinner with label
String langName = DictLangCache.getLangName( this, m_gi.dictLang );
String label = getString( R.string.dict_lang_labelf, langName );
TextView text = (TextView)dialog.findViewById( R.id.dict_label );
text.setText( label );
configDictSpinner( dialog, lp );
TextView dictLabel = (TextView)dialog.findViewById( R.id.dict_label );
if ( localOnlyGame() ) {
String langName = DictLangCache.getLangName( this, m_gi.dictLang );
String label = getString( R.string.dict_lang_labelf, langName );
dictLabel.setText( label );
} else {
dictLabel.setVisibility( View.GONE );
}
Spinner dictSpinner = (Spinner)dialog.findViewById( R.id.dict_spinner );
if ( localOnlyGame() ) {
configDictSpinner( dictSpinner, m_gi.dictLang, m_gi.dictName(lp) );
} else {
dictSpinner.setVisibility( View.GONE );
}
final View localSet = dialog.findViewById( R.id.local_player_set );
@ -360,15 +370,18 @@ public class GameConfig extends XWActivity
LocalPlayer lp = m_gi.players[m_whichPlayer];
lp.name = Utils.getText( dialog, R.id.player_name_edit );
lp.password = Utils.getText( dialog, R.id.password_edit );
Spinner spinner =
(Spinner)((Dialog)di).findViewById( R.id.dict_spinner );
int position = spinner.getSelectedItemPosition();
SpinnerAdapter adapter = spinner.getAdapter();
if ( position < adapter.getCount() ) {
String name = (String)adapter.getItem( position );
if ( ! name.equals( m_browseText ) ) {
lp.dictName = name;
if ( localOnlyGame() ) {
Spinner spinner =
(Spinner)((Dialog)di).findViewById( R.id.dict_spinner );
int position = spinner.getSelectedItemPosition();
SpinnerAdapter adapter = spinner.getAdapter();
if ( position < adapter.getCount() ) {
String name = (String)adapter.getItem( position );
if ( ! name.equals( m_browseText ) ) {
lp.dictName = name;
}
}
}
@ -498,6 +511,16 @@ public class GameConfig extends XWActivity
setTitle();
TextView label = (TextView)findViewById( R.id.lang_separator );
label.setText( getString( localOnlyGame() ? R.string.lang_label
: R.string.langdict_label ) );
m_dictSpinner = (Spinner)findViewById( R.id.dict_spinner );
if ( localOnlyGame() ) {
m_dictSpinner.setVisibility( View.GONE );
m_dictSpinner = null;
}
if ( m_conType.equals( CommsConnType.COMMS_CONN_RELAY ) ) {
m_joinPublicCheck =
(CheckBox)findViewById(R.id.join_public_room_check);
@ -675,12 +698,13 @@ public class GameConfig extends XWActivity
}
};
boolean localGame = localOnlyGame();
for ( int ii = 0; ii < names.length; ++ii ) {
final XWListItem view
= (XWListItem)factory.inflate( R.layout.list_item, null );
view.setPosition( ii );
view.setText( names[ii] );
if ( m_gi.players[ii].isLocal ) {
if ( localGame && m_gi.players[ii].isLocal ) {
view.setComment( m_gi.dictName(ii) );
}
if ( canDelete ) {
@ -718,12 +742,12 @@ public class GameConfig extends XWActivity
adjustPlayersLabel();
} // loadPlayersList
private void configDictSpinner( final Dialog dialog, LocalPlayer lp )
private void configDictSpinner( Spinner dictsSpinner, int lang,
String curDict )
{
Spinner dictsSpinner =
(Spinner)dialog.findViewById( R.id.dict_spinner );
String lang = DictLangCache.getLangName( this, m_gi.dictLang );
dictsSpinner.setPrompt( getString( R.string.dicts_list_promptf, lang ) );
String langName = DictLangCache.getLangName( this, lang );
dictsSpinner.setPrompt( getString( R.string.dicts_list_promptf,
langName ) );
OnItemSelectedListener onSel =
new OnItemSelectedListener() {
@ -745,9 +769,9 @@ public class GameConfig extends XWActivity
};
ArrayAdapter<String> adapter =
DictLangCache.getDictsAdapter( this, m_gi.dictLang );
configSpinnerWDownload( dictsSpinner, adapter, onSel,
m_gi.dictName(lp) );
DictLangCache.getDictsAdapter( this, lang );
configSpinnerWDownload( dictsSpinner, adapter, onSel, curDict );
}
private void configLangSpinner()
@ -767,6 +791,10 @@ public class GameConfig extends XWActivity
getLangLangCode( GameConfig.this,
chosen ) );
loadPlayersList();
if ( null != m_dictSpinner ) {
configDictSpinner( m_dictSpinner, m_gi.dictLang,
m_gi.dictName );
}
}
}
@ -1020,6 +1048,14 @@ public class GameConfig extends XWActivity
private void saveChanges()
{
if ( !localOnlyGame() ) {
Spinner dictSpinner = (Spinner)findViewById( R.id.dict_spinner );
String name = (String)dictSpinner.getSelectedItem();
if ( !m_browseText.equals( name ) ) {
m_gi.dictName = name;
}
}
m_gi.hintsNotAllowed = !Utils.getChecked( this, R.id.hints_allowed );
m_gi.allowPickTiles = Utils.getChecked( this, R.id.pick_faceup );
m_gi.timerEnabled = Utils.getChecked( this, R.id.use_timer );