Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

start to fill in text for new-game dialog.

Browse source
This commit is contained in:
Andy2 2011-05-16 06:35:49 -07:00
parent 332767105c
commit 6b4320e727
3 changed files with 65 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
xwords4/android/XWords4/res/layout/new_game.xml
View file

@ -20,41 +20,59 @@
android:layout_height="fill_parent"
>
<TextView android:text="explanatory text"
style="@style/relay_explain"
<TextView style="@style/config_separator"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/newgame_local_header"
/>
<Button android:id="@+id/new_game_local"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/new_game_local"
/>
<TextView android:text="explanatory text"
style="@style/relay_explain"
/>
<Button android:id="@+id/new_game_local_config"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/new_game_local_config"
/>
<TextView android:text="explanatory text"
<TextView android:text="@string/newgame_local_desc"
style="@style/relay_explain"
/>
<Button android:id="@+id/new_game_invite"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/new_game_invite"
/>
<LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
>
<Button android:id="@+id/newgame_local"
android:layout_width="fill_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/newgame_local"
/>
<Button android:id="@+id/newgame_local_config"
android:layout_width="fill_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/newgame_local_config"
/>
</LinearLayout>
<TextView android:text="explanatory text"
<TextView style="@style/config_separator"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/newgame_networked_header"
/>
<TextView android:text="@string/newgame_networked_desc"
style="@style/relay_explain"
/>
<Button android:id="@+id/new_game_net_config"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/new_game_net_config"
/>
<LinearLayout android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
>
<Button android:id="@+id/newgame_invite"
android:layout_width="fill_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/newgame_invite"
/>
<Button android:id="@+id/newgame_net_config"
android:layout_width="fill_parent"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/newgame_net_config"
/>
</LinearLayout>
</LinearLayout>

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

@ -36,6 +36,7 @@
<string name="title_games_list">Crosswords</string>
<string name="title_dicts_list">Dictionaries</string>
<string name="title_newgame">New game</string>
<string name="title_langs_list">Languages (based on installed
dictionaries)</string>
<string name="lang_label">Game language</string>
@ -46,10 +47,21 @@
<string name="app_name">Crosswords</string>
<string name="new_game_local">Play new local game</string>
<string name="new_game_local_config">Configure new local game</string>
<string name="new_game_invite">Invite to new networked game</string>
<string name="new_game_net_config">Configure new networked game</string>
<string name="newgame_local_header">New Local-only game</string>
<string name="newgame_local_desc">Create a new game where all
players will be on this device. To play with all the default
setting, just press \"Play Game\". To change some settings
first, press \"Configure game\".</string>
<string name="newgame_networked_header">New Networked game</string>
<string name="newgame_networked_desc">Create a game that will be
played over the network. The \"Invite now\" button starts a
game and helps you invite a friend to join it. Or press
\"Configure game\" to change some of the defaults before you
start your networked game.</string>
<string name="newgame_local">Play game</string>
<string name="newgame_local_config">Configure game</string>
<string name="newgame_invite">Invite now</string>
<string name="newgame_net_config">Configure first</string>
<string name="button_ok">OK</string>
<string name="button_cancel">Cancel</string>

8
xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java
View file

@ -46,14 +46,14 @@ public class NewGameActivity extends XWActivity {
setContentView( R.layout.new_game );
Button button = (Button)findViewById( R.id.new_game_local );
Button button = (Button)findViewById( R.id.newgame_local );
button.setOnClickListener( new View.OnClickListener() {
@Override
public void onClick( View v ) {
newAndLaunch();
}
} );
button = (Button)findViewById( R.id.new_game_local_config );
button = (Button)findViewById( R.id.newgame_local_config );
button.setOnClickListener( new View.OnClickListener() {
@Override
public void onClick( View v ) {
@ -61,7 +61,7 @@ public class NewGameActivity extends XWActivity {
}
} );
button = (Button)findViewById( R.id.new_game_invite );
button = (Button)findViewById( R.id.newgame_invite );
button.setOnClickListener( new View.OnClickListener() {
@Override
public void onClick( View v ) {
@ -69,7 +69,7 @@ public class NewGameActivity extends XWActivity {
}
} );
button = (Button)findViewById( R.id.new_game_net_config );
button = (Button)findViewById( R.id.newgame_net_config );
button.setOnClickListener( new View.OnClickListener() {
@Override
public void onClick( View v ) {