Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-05 20:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

refactor to rebuild dict list onResume() to pick up any downloaded dicts.

Browse source
This commit is contained in:
eehouse 2010-03-13 23:11:35 +00:00
parent 6eb045d3a8
commit 0f620305f0
1 changed files with 43 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -368,40 +368,10 @@ public class GameConfig extends Activity implements View.OnClickListener {
loadPlayers(); loadPlayers();
m_dictSpinner = (Spinner)findViewById( R.id.dict_spinner ); m_dictSpinner = (Spinner)findViewById( R.id.dict_spinner );
ArrayAdapter<String> adapter = configDictSpinner();
new ArrayAdapter<String>( this,
android.R.layout.simple_spinner_item,
m_dicts );
int resID = android.R.layout.simple_spinner_dropdown_item;
adapter.setDropDownViewResource( resID );
m_dictSpinner.setAdapter( adapter );
if ( curSel >= 0 ) {
m_dictSpinner.setSelection( curSel );
}
m_dictSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parentView,
View selectedItemView, int position,
long id) {
if ( position == m_browsePosition ) {
Uri uri = Uri.parse( getString( R.string.dict_url ));
Intent intent = new Intent( Intent.ACTION_VIEW, uri );
intent.setFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
startActivity (intent );
} else {
m_gi.dictName = m_dicts[position];
Utils.logf( "assigned dictName: " + m_gi.dictName );
}
}
@Override
public void onNothingSelected(AdapterView<?> parentView) {
}
});
m_roleSpinner = (Spinner)findViewById( R.id.role_spinner ); m_roleSpinner = (Spinner)findViewById( R.id.role_spinner );
adapter = ArrayAdapter<String> adapter =
new ArrayAdapter<String>( this, new ArrayAdapter<String>( this,
android.R.layout.simple_spinner_item, android.R.layout.simple_spinner_item,
new String[] { new String[] {
@ -577,6 +547,13 @@ public class GameConfig extends Activity implements View.OnClickListener {
return consumed; return consumed;
} }
@Override
protected void onResume()
{
configDictSpinner();
super.onResume();
}
private void loadPlayers() private void loadPlayers()
{ {
m_playerLayout.removeAllViews(); m_playerLayout.removeAllViews();
@ -620,7 +597,7 @@ public class GameConfig extends Activity implements View.OnClickListener {
{ {
int curSel = -1; int curSel = -1;
String[] list = Utils.listDicts( this ); String[] list = Utils.dictList( this );
m_browsePosition = list.length; m_browsePosition = list.length;
m_dicts = new String[m_browsePosition+1]; m_dicts = new String[m_browsePosition+1];
@ -637,6 +614,39 @@ public class GameConfig extends Activity implements View.OnClickListener {
return curSel; return curSel;
} }
private void configDictSpinner()
{
int curSel = listAvailableDicts( m_gi.dictName );
ArrayAdapter<String> adapter =
new ArrayAdapter<String>( this,
android.R.layout.simple_spinner_item,
m_dicts );
int resID = android.R.layout.simple_spinner_dropdown_item;
adapter.setDropDownViewResource( resID );
m_dictSpinner.setAdapter( adapter );
if ( curSel >= 0 ) {
m_dictSpinner.setSelection( curSel );
}
m_dictSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parentView,
View selectedItemView,
int position, long id ) {
if ( position == m_browsePosition ) {
startActivity( Utils.mkDownloadActivity(GameConfig.this) );
} else {
m_gi.dictName = m_dicts[position];
Utils.logf( "assigned dictName: " + m_gi.dictName );
}
}
@Override
public void onNothingSelected(AdapterView<?> parentView) {}
});
}
private void configConnectSpinner() private void configConnectSpinner()
{ {
m_connectSpinner = (Spinner)findViewById( R.id.connect_spinner ); m_connectSpinner = (Spinner)findViewById( R.id.connect_spinner );