diff --git a/xwords4/android/XWords4/AndroidManifest.xml b/xwords4/android/XWords4/AndroidManifest.xml index 34772cf9f..74a1e6aac 100644 --- a/xwords4/android/XWords4/AndroidManifest.xml +++ b/xwords4/android/XWords4/AndroidManifest.xml @@ -22,7 +22,7 @@ to come from a domain that you own or have control over. --> diff --git a/xwords4/android/XWords4/res/layout/wordlist_view.xml b/xwords4/android/XWords4/res/layout/wordlist_view.xml deleted file mode 100644 index 2fd980698..000000000 --- a/xwords4/android/XWords4/res/layout/wordlist_view.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - diff --git a/xwords4/android/XWords4/res/raw/changes b/xwords4/android/XWords4/res/raw/changes index c3565c2ac..3391812a8 100644 --- a/xwords4/android/XWords4/res/raw/changes +++ b/xwords4/android/XWords4/res/raw/changes @@ -6,26 +6,19 @@ -Crosswords 4.4 beta 34 release +Crosswords 4.4 beta 35 release diff --git a/xwords4/android/XWords4/res/values/common_rsrc.xml b/xwords4/android/XWords4/res/values/common_rsrc.xml index 8b1934157..27aca3b85 100644 --- a/xwords4/android/XWords4/res/values/common_rsrc.xml +++ b/xwords4/android/XWords4/res/values/common_rsrc.xml @@ -3,6 +3,8 @@ + 4.4 beta 35 + key_color_tiles key_show_arrow @@ -73,6 +75,7 @@ key_notagain_newfrom key_notagain_trading key_na_needUrlsForLang + key_na_lookup Crosswords @@ -82,7 +85,6 @@ http://eehouse.org/and_wordlists - 4.4 beta 34 //%1$s/newgame.php diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index e76f63b4c..e7bec1dba 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -1782,5 +1782,10 @@ lookup site I have for this language. If you have suggestions for word-lookup sites please email eehouse@eehouse.org . + + This button lets you look up the + words just played online. (Note that not all languages are + supported yet.) + diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java index d63f7c389..712e947be 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java @@ -40,21 +40,15 @@ import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.DialogInterface; import android.content.DialogInterface.OnDismissListener; -import android.content.DialogInterface.OnCancelListener; -import android.widget.AdapterView; -import android.widget.AdapterView.OnItemClickListener; import android.widget.Button; import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.EditText; -import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; import junit.framework.Assert; import android.content.res.Configuration; -import android.content.res.Resources; import android.content.pm.ActivityInfo; -import android.net.Uri; import org.eehouse.android.xw4.jni.*; import org.eehouse.android.xw4.jni.JNIThread.*; @@ -95,6 +89,7 @@ public class BoardActivity extends XWActivity private static final int UNDO_ACTION = 11; private static final int CHAT_ACTION = 12; private static final int START_TRADE_ACTION = 13; + private static final int LOOKUP_ACTION = 14; private static final String DLG_TITLE = "DLG_TITLE"; private static final String DLG_TITLESTR = "DLG_TITLESTR"; @@ -102,7 +97,6 @@ public class BoardActivity extends XWActivity private static final String ROOM = "ROOM"; private static final String TOASTSTR = "TOASTSTR"; private static final String WORDS = "WORDS"; - private static final String LOOKUPITEM = "LOOKUPITEM"; private BoardView m_view; private int m_jniGamePtr; @@ -172,7 +166,6 @@ public class BoardActivity extends XWActivity Dialog dialog = super.onCreateDialog( id ); if ( null == dialog ) { DialogInterface.OnClickListener lstnr; - DialogInterface.OnClickListener doneLstnr; AlertDialog.Builder ab; switch ( id ) { @@ -253,7 +246,11 @@ public class BoardActivity extends XWActivity lstnr = new DialogInterface.OnClickListener() { public void onClick( DialogInterface dialog, int whichButton ) { - launchLookup( m_words ); + showNotAgainDlgThen( R.string. + not_again_lookup, + R.string. + key_na_lookup, + LOOKUP_ACTION ); } }; ab.setNegativeButton( buttonTxt, lstnr ); @@ -507,7 +504,8 @@ public class BoardActivity extends XWActivity // For now undo-last can crash the app or break a game in // networked case. Disable until this is fixed. - if ( m_gi.serverRole != DeviceRole.SERVER_STANDALONE ) { + if ( null != m_gi + && m_gi.serverRole != DeviceRole.SERVER_STANDALONE ) { menu.removeItem( R.id.board_menu_undo_last ); } return true; @@ -684,6 +682,9 @@ public class BoardActivity extends XWActivity Toast.LENGTH_SHORT).show(); cmd = JNIThread.JNICmd.CMD_TRADE; break; + case LOOKUP_ACTION: + launchLookup( m_words ); + break; default: Assert.fail(); } diff --git a/xwords4/common/model.c b/xwords4/common/model.c index c17e1e72c..9779b9135 100644 --- a/xwords4/common/model.c +++ b/xwords4/common/model.c @@ -2039,7 +2039,6 @@ recordWord( const XP_UCHAR* word, XP_Bool isLegal, void* closure ) { RecordWordsInfo* info = (RecordWordsInfo*)closure; XWStreamCtxt* stream = info->stream; - XP_ASSERT( isLegal ); XP_LOGF( "%s(%s)", __func__, word ); if ( 0 < info->nWords++ ) { stream_putU8( stream, '\n' );