diff --git a/xwords4/android/XWords4/AndroidManifest.xml b/xwords4/android/XWords4/AndroidManifest.xml
index 43a6af412..c858e6006 100644
--- a/xwords4/android/XWords4/AndroidManifest.xml
+++ b/xwords4/android/XWords4/AndroidManifest.xml
@@ -69,6 +69,10 @@
android:label="@string/title_dicts_list"
/>
+
+
-
+
+
+
+
+
+
diff --git a/xwords4/android/XWords4/res/layout/new_game.xml b/xwords4/android/XWords4/res/layout/new_game.xml
new file mode 100644
index 000000000..5cc3e22fb
--- /dev/null
+++ b/xwords4/android/XWords4/res/layout/new_game.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xwords4/android/XWords4/res/menu/games_list_menu.xml b/xwords4/android/XWords4/res/menu/games_list_menu.xml
index 798242dea..1215050b4 100644
--- a/xwords4/android/XWords4/res/menu/games_list_menu.xml
+++ b/xwords4/android/XWords4/res/menu/games_list_menu.xml
@@ -4,6 +4,9 @@
+ -
Delete
- Add single-device game
- Add multi-device game
+ Add game
+
Play game
Game settings...
@@ -41,6 +41,7 @@
Edit game
Crosswords
Dictionaries (wordcount)
+ New game
Languages (based on installed
dictionaries)
Game language
@@ -50,6 +51,11 @@
Crosswords settings
Crosswords
+
+ Play new local game
+ Configure new local game
+ Invite to new networked game
+ Configure new networked game
OK
Cancel
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
index 81fb954b6..404e13966 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
@@ -186,27 +186,31 @@ public class GamesList extends XWListActivity
newGameB.setOnClickListener( new View.OnClickListener() {
@Override
public void onClick( View v ) {
- addGame( false );
- showNotAgainDlg( R.string.not_again_newgame,
- R.string.key_notagain_newgame );
- }
- });
- newGameB = (Button)findViewById(R.id.new_game_net);
- newGameB.setOnClickListener( new View.OnClickListener() {
- @Override
- public void onClick( View v ) {
- String path = addGame( true );
- GameUtils.doConfig( GamesList.this, path,
- RelayGameActivity.class );
+ // addGame( false );
+ startActivity( new Intent( GamesList.this,
+ NewGameActivity.class ) );
+ // showNotAgainDlg( R.string.not_again_newgame,
+ // R.string.key_notagain_newgame );
}
});
+ // newGameB = (Button)findViewById(R.id.new_game_net);
+ // newGameB.setOnClickListener( new View.OnClickListener() {
+ // @Override
+ // public void onClick( View v ) {
+ // String path = addGame( true );
+ // GameUtils.doConfig( GamesList.this, path,
+ // RelayGameActivity.class );
+ // }
+ // });
m_adapter = new GameListAdapter( this, this );
setListAdapter( m_adapter );
NetUtils.informOfDeaths( this );
- startFirstHasDict( getIntent() );
+ Intent intent = getIntent();
+ startFirstHasDict( intent );
+ startNewGameIf( intent );
DBUtils.setDBChangeListener( this );
} // onCreate
@@ -494,25 +498,6 @@ public class GamesList extends XWListActivity
return hasDicts;
}
- private String saveNew( CurGameInfo gi )
- {
- String path = null;
- byte[] bytes = XwJNI.gi_to_stream( gi );
- if ( null != bytes ) {
- GameUtils.GameLock lock = GameUtils.saveGame( this, bytes );
- path = lock.getPath();
- lock.unlock();
- }
- return path;
- }
-
- private String addGame( boolean networked )
- {
- String path = saveNew( new CurGameInfo( this, networked ) );
- GameUtils.resetGame( this, path );
- return path;
- }
-
private void invalRelayIDs( String[] relayIDs )
{
if ( null == relayIDs ) {
@@ -550,4 +535,17 @@ public class GamesList extends XWListActivity
startFirstHasDict( relayIDs );
}
}
+
+ private void startNewGameIf( Intent intent )
+ {
+ if ( null != intent ) {
+ Uri data = intent.getData();
+ if ( null != data ) {
+ String room = data.getQueryParameter( "room" );
+ String langStr = data.getQueryParameter( "lang" );
+ int lang = Integer.decode( langStr );
+ Utils.logf( "got data: lang: %d; room: %s", lang, room );
+ }
+ }
+ }
}
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java
new file mode 100644
index 000000000..09329e622
--- /dev/null
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java
@@ -0,0 +1,147 @@
+/* -*- compile-command: "cd ../../../../../; ant install"; -*- */
+/*
+ * Copyright 2009-2010 by Eric House (xwords@eehouse.org). All
+ * rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+package org.eehouse.android.xw4;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import java.util.Random;
+
+// import junit.framework.Assert;
+
+import org.eehouse.android.xw4.jni.CurGameInfo;
+import org.eehouse.android.xw4.jni.CommonPrefs;
+import org.eehouse.android.xw4.jni.CommsAddrRec;
+import org.eehouse.android.xw4.jni.XwJNI;
+
+
+public class NewGameActivity extends XWActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState)
+ {
+ super.onCreate( savedInstanceState );
+
+ setContentView( R.layout.new_game );
+
+ Button button = (Button)findViewById( R.id.new_game_local );
+ button.setOnClickListener( new View.OnClickListener() {
+ @Override
+ public void onClick( View v ) {
+ newAndLaunch();
+ }
+ } );
+ button = (Button)findViewById( R.id.new_game_local_config );
+ button.setOnClickListener( new View.OnClickListener() {
+ @Override
+ public void onClick( View v ) {
+ newAndConfigure( false );
+ }
+ } );
+
+ button = (Button)findViewById( R.id.new_game_invite );
+ button.setOnClickListener( new View.OnClickListener() {
+ @Override
+ public void onClick( View v ) {
+ newNetworkedAndLaunch();
+ }
+ } );
+
+ button = (Button)findViewById( R.id.new_game_net_config );
+ button.setOnClickListener( new View.OnClickListener() {
+ @Override
+ public void onClick( View v ) {
+ newAndConfigure( true );
+ }
+ } );
+
+ }
+
+ private String saveNew( CurGameInfo gi )
+ {
+ String path = null;
+ byte[] bytes = XwJNI.gi_to_stream( gi );
+ if ( null != bytes ) {
+ GameUtils.GameLock lock = GameUtils.saveGame( this, bytes );
+ path = lock.getPath();
+ lock.unlock();
+ }
+ return path;
+ }
+
+ private void newAndLaunch()
+ {
+ String path = saveNew( new CurGameInfo( this ) );
+ GameUtils.launchGame( this, path );
+ finish();
+ }
+
+ // So: Query the user for the desired room name and player name,
+ // providing defaults.
+ private void newNetworkedAndLaunch()
+ {
+ CommsAddrRec addr = new CommsAddrRec( this );
+ Random random = new Random();
+ addr.ip_relay_invite = String.format( "%X", random.nextInt() );
+ Utils.logf( "room: %s", addr.ip_relay_invite );
+
+ CurGameInfo gi = new CurGameInfo( this, true );
+ String path = saveNew( gi );
+
+ GameUtils.GameLock lock =
+ new GameUtils.GameLock( path, true ).lock();
+ GameUtils.applyChanges( this, gi, addr, lock, false );
+ lock.unlock();
+
+ Intent intent = new Intent( Intent.ACTION_SEND );
+ intent.setType( "plain/text" );
+ intent.putExtra( Intent.EXTRA_SUBJECT, "Let's play Crosswords" );
+ intent.putExtra( Intent.EXTRA_TEXT,
+ mkMsgWithLink( addr.ip_relay_invite, gi.dictLang ) );
+
+ GameUtils.launchGame( this, path );
+
+ startActivity( Intent.createChooser( intent,
+ "Send your invitation via" ) );
+
+ finish();
+ }
+
+ private String mkMsgWithLink( String room, int lang )
+ {
+ String host = CommonPrefs.getDefaultRelayHost( this );
+ String format = "Click on this link to start a game: " +
+ "http://%s/redir.php?room=%s&lang=%d";
+ return String.format( format, host, room, lang );
+ }
+
+ private void newAndConfigure( boolean networked )
+ {
+ String path = saveNew( new CurGameInfo( this, networked ) );
+ GameUtils.doConfig( this, path, GameConfig.class );
+ finish();
+ }
+
+}
\ No newline at end of file