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

fetch public rooms using new class rather than hardcoding. With this

Browse source 
checkin game is possible based on public-room lookup.
This commit is contained in:
Andy2 2010-09-28 06:48:51 -07:00
parent 132321c9fd
commit 953e4601b9
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@ import android.content.DialogInterface;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.ImageButton;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.widget.Spinner; import android.widget.Spinner;
@ -74,6 +75,7 @@ public class GameConfig extends Activity implements View.OnClickListener,
private boolean m_notNetworkedGame; private boolean m_notNetworkedGame;
private Button m_addPlayerButton; private Button m_addPlayerButton;
private Button m_jugglePlayersButton; private Button m_jugglePlayersButton;
private ImageButton m_refreshRoomsButton;
private View m_connectSet; // really a LinearLayout private View m_connectSet; // really a LinearLayout
private Spinner m_roomChoose; private Spinner m_roomChoose;
// private Button m_configureButton; // private Button m_configureButton;
@ -367,12 +369,9 @@ public class GameConfig extends Activity implements View.OnClickListener,
// m_configureButton.setOnClickListener( this ); // m_configureButton.setOnClickListener( this );
m_roomChoose = (Spinner)findViewById( R.id.room_spinner ); m_roomChoose = (Spinner)findViewById( R.id.room_spinner );
String[] rooms = { "Room 1", "NSA 1200+", "Some other room" };
ArrayAdapter<String> adapter = m_refreshRoomsButton = (ImageButton)findViewById( R.id.refresh_button );
new ArrayAdapter<String>( this, m_refreshRoomsButton.setOnClickListener( this );
android.R.layout.simple_spinner_item,
rooms );
m_roomChoose.setAdapter( adapter );
adjustConnectStuff(); adjustConnectStuff();
@ -477,6 +476,9 @@ public class GameConfig extends Activity implements View.OnClickListener,
// showDialog( ROLE_EDIT_BT ); // showDialog( ROLE_EDIT_BT );
// break; // break;
// } // }
} else if ( m_refreshRoomsButton == view ) {
new RefreshNamesTask( this, m_gi.dictLang, m_gi.nPlayers,
m_roomChoose ).execute();
} else { } else {
Utils.logf( "unknown v: " + view.toString() ); Utils.logf( "unknown v: " + view.toString() );
} }
@ -674,16 +676,18 @@ public class GameConfig extends Activity implements View.OnClickListener,
m_privateRoomsSet.setVisibility( View.GONE ); m_privateRoomsSet.setVisibility( View.GONE );
m_publicRoomsSet.setVisibility( View.VISIBLE ); m_publicRoomsSet.setVisibility( View.VISIBLE );
// make the room spinner match the saved value if present // // make the room spinner match the saved value if present
String invite = m_car.ip_relay_invite; // String invite = m_car.ip_relay_invite;
ArrayAdapter<String> adapter = // ArrayAdapter<String> adapter =
(ArrayAdapter<String>)m_roomChoose.getAdapter(); // (ArrayAdapter<String>)m_roomChoose.getAdapter();
for ( int ii = 0; ii < adapter.getCount(); ++ii ) { // if ( null != adapter ) {
if ( adapter.getItem(ii).equals( invite ) ) { // for ( int ii = 0; ii < adapter.getCount(); ++ii ) {
m_roomChoose.setSelection( ii ); // if ( adapter.getItem(ii).equals( invite ) ) {
break; // m_roomChoose.setSelection( ii );
} // break;
} // }
// }
// }
} else { } else {
m_privateRoomsSet.setVisibility( View.VISIBLE ); m_privateRoomsSet.setVisibility( View.VISIBLE );
@ -776,8 +780,10 @@ public class GameConfig extends Activity implements View.OnClickListener,
if ( m_car.ip_relay_seeksPublicRoom ) { if ( m_car.ip_relay_seeksPublicRoom ) {
ArrayAdapter<String> adapter = ArrayAdapter<String> adapter =
(ArrayAdapter<String>)m_roomChoose.getAdapter(); (ArrayAdapter<String>)m_roomChoose.getAdapter();
if ( null != adapter ) {
m_car.ip_relay_invite = m_car.ip_relay_invite =
adapter.getItem(m_roomChoose.getSelectedItemPosition()); adapter.getItem(m_roomChoose.getSelectedItemPosition());
}
} else { } else {
m_car.ip_relay_invite = Utils.getText( this, R.id.room_edit ); m_car.ip_relay_invite = Utils.getText( this, R.id.room_edit );
} }