mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2024-12-29 10:26:36 +01:00
hide name edit for existing games
This is a simpler fix that making it editable, as the name's in the titlebar etc.
This commit is contained in:
parent
4f8afadb25
commit
a83fbfebe2
3 changed files with 11 additions and 6 deletions
|
@ -667,8 +667,12 @@ public class GameConfigDelegate extends DelegateBase
|
|||
setConnLabel();
|
||||
loadPlayersList();
|
||||
configLangSpinner();
|
||||
EditText et = (EditText)findViewById( R.id.name_edit );
|
||||
et.setText( m_newGameName );
|
||||
if ( m_isNewGame ) {
|
||||
EditText et = (EditText)findViewById( R.id.game_name_edit );
|
||||
et.setText( m_newGameName );
|
||||
} else {
|
||||
findViewById( R.id.game_name_edit_row ).setVisibility( View.GONE );
|
||||
}
|
||||
|
||||
m_phoniesSpinner.setSelection( m_gi.phoniesAction.ordinal() );
|
||||
|
||||
|
|
|
@ -74,7 +74,7 @@ public class GameSummary implements Serializable {
|
|||
private String[] m_players;
|
||||
public CommsConnTypeSet conTypes;
|
||||
// relay-related fields
|
||||
public String roomName;
|
||||
public String roomName; // PENDING remove me
|
||||
public String relayID;
|
||||
public int seed;
|
||||
public long modtime;
|
||||
|
@ -134,7 +134,7 @@ public class GameSummary implements Serializable {
|
|||
&& Arrays.equals( m_players, other.m_players )
|
||||
&& ((null == conTypes) ? (null == other.conTypes)
|
||||
: conTypes.equals(other.conTypes))
|
||||
&& TextUtils.equals( roomName, other.roomName )
|
||||
// && TextUtils.equals( roomName, other.roomName )
|
||||
&& TextUtils.equals( relayID, other.relayID )
|
||||
&& Arrays.equals( remoteDevs, other.remoteDevs )
|
||||
&& ((null == serverRole) ? (null == other.serverRole)
|
||||
|
|
|
@ -52,7 +52,8 @@
|
|||
android:layout_margin="4dp"
|
||||
>
|
||||
|
||||
<LinearLayout android:orientation="horizontal"
|
||||
<LinearLayout android:id="@+id/game_name_edit_row"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
>
|
||||
|
@ -62,7 +63,7 @@
|
|||
/>
|
||||
<EditText android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/name_edit"
|
||||
android:id="@+id/game_name_edit"
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
||||
|
|
Loading…
Reference in a new issue