Commit graph

1051 commits

Author SHA1 Message Date
Andy2
f03699f701 add newbie warning/request for languages with only google as
word-lookup site.
2011-10-06 19:03:07 -07:00
Andy2
a129f353f5 fix assertion by skipping states only when applicable, and running in
a loop so works in either direction.  Cleanup -- this is done.
2011-10-06 18:44:24 -07:00
Andy2
0a474804ce fix to work with bundling, i.e. by removing configChanges entry in
AndroidManifest.xml and changing orientation.
2011-10-06 18:25:17 -07:00
Andy2
d8c1e3822b fix problems with skipping singleton words and URLs; replace window
title with TextView.
2011-10-06 17:47:00 -07:00
Andy2
a9b467c903 make adapter based on static array static 2011-10-06 06:31:04 -07:00
Andy2
e292056b9c add new activity (with layout) to replace dialogs for word lookup.
Lots of code moved there from BoardActivity.
2011-10-06 06:26:46 -07:00
Andy2
90f11abc37 add to game state passed into java world whether it's the cur selected
player's turn, and use that to enable/disable Pass/Turn done button.
2011-10-05 06:36:01 -07:00
Andy2
179560867f for symmetry, remove default menu title from res file and set in code
either way.
2011-10-05 06:14:48 -07:00
Andy2
c5c0fbccae remove unused DrawFocusState params from jni interface 2011-10-04 19:03:27 -07:00
Andy2
3ec97d5c07 Turn "Turn done" into "Pass" when the pending score is 0. To do that
I had to pass the score into draw_trayBegin since
draw_drawPendingScore() isn't called until the first tile's placed.
Note: as long as I'm messinng with this menuitem it should be disabled
when it's not the player's turn.
2011-10-04 18:48:33 -07:00
Andy2
f4b8b2806e remove unused parameter 2011-10-04 06:48:53 -07:00
Andy2
5773466fb6 prevent lookup dialogs from coming up before button pressed by not
assigning m_words too early.
2011-10-04 06:19:06 -07:00
Andy2
072516655e Use words list passed into informMove rather than query when user
presses button.  Include word in button text when there's only one.
2011-10-03 06:43:20 -07:00
Andy2
35e4c21f17 add util_informMove to jni. Use it, but not to advantage yet. 2011-10-02 16:42:10 -07:00
Andy2
b7691d2997 Merge branch 'android_branch' into two_phase_lookup
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
2011-09-22 06:53:45 -07:00
Andy2
fcdbed0920 fix to work with changed C api 2011-09-22 06:49:34 -07:00
Andy2
b10453bd25 cleanup 2011-09-22 06:14:22 -07:00
Andy2
e887d0a116 make word lookup two-stage, first a dialog to pick the word then
another to pick the URL.  Hacky code takes us back to the first after
the second is dismissed while only showing either if there's a choice
to be made.  Also add menu item to lookup all words in the game --
useful for testing when robot refuses to play multiple words but maybe
also worth shipping.
2011-09-21 19:04:33 -07:00
Andy2
c44a884184 try another item layout -- need to fix the background instead. 2011-09-21 05:47:12 -07:00
Andy2
617de4eb7e make lookup dialog two-part, with list of lang-supporting URLs at top
and words at bottom.  You choose a URL/site, then tap a word, and
repeat until you're done.
2011-09-20 19:01:37 -07:00
Andy2
97334faa95 switch to lookup url that can include language, and include it when
French or German in use.  Disable button if I don't know how to look a
word up.  Later will want to have multiple URLs available, falling
back to googling for the word if I don't know about an online
dictionary.
2011-09-19 07:53:29 -07:00
Andy2
d7a04f87e6 add custom view for wordlist dialog so it doesn't get dismissed the
first time you pick a word -- now all can be looked up if desired.
2011-09-19 06:45:15 -07:00
Andy2
ea3e015a8f use server_listWordsPlayed to implement lookup button: get list from
jni, and when it calls back with it launch the browser directly if
there's only one, otherwise put up a choice list.  Currently the list
dismisses after launching the browser once: need to fix that, probably
with a custom View.  And need to deal with non-English games, and
maybe add other choices for lookup than dictionary.com.
2011-09-18 19:10:12 -07:00
Andy2
dced47e202 export server_listWordsPlayed via jni. 2011-09-18 19:06:23 -07:00
Andy2
b579bb0bca first step in implementing lookup of words: add button and browser
launch to single website for hard-coded word.
2011-09-16 06:44:25 -07:00
Andy2
131bb561bc cache reference to prefs 2011-09-15 18:59:39 -07:00
Eric House
a676b5beb0 comment out dead code referencing strings 2011-09-15 18:06:12 -07:00
Andy2
9f6391ba34 cache the most recently loaded game's byte[] data. Saves about 2/3 of
the reads from the DB.
2011-09-12 19:52:18 -07:00
Andy2
99498a8568 use static HashMap to track what language views are open and closed.
As long as I'm not reloaded user choice will be preserved.  Good
enough.
2011-09-12 19:00:13 -07:00
Andy2
72d769910b expand children after a delete (to be consistent, though it'd be
better to rememeber state)
2011-09-12 18:37:04 -07:00
Andy2
68c85ec176 use new class to inval list of dicts when SD card inserted or ejected. 2011-09-12 18:29:18 -07:00
Andy2
14608d2deb listen for SD card events via BroadcastReceiver registered in
AndroidManifest rather than created programatically: only with this
can I get EJECT events to work.  Replacement class has static
register/unregister methods which DictsActivity uses.
2011-09-12 18:28:43 -07:00
Andy2
8c0657f1cd add showf for Toast-based debugging 2011-09-12 18:22:37 -07:00
Andy2
c9c498786e add to game state whether any tiles selected. Use that to disable
'commit exchange' button when there's nothing to commit, and get rid
of error message used when committing nothing since it's now
impossible (on Android).
2011-09-09 19:04:25 -07:00
Andy2
ec6108501d draw timer in full color even in exchange mode 2011-09-09 18:23:19 -07:00
Andy2
1d612288d4 add optional param to confirmation dialogs to allow positive button
other than Ok; add "Delete" and "Reset" for game and dict actions.
2011-09-09 06:50:00 -07:00
Andy2
fda3207b78 fix inability to tell whether a dict being deleted is in use: add to
summaries DB list of dicts in the game and a method that queries that.
Pick delete-confirmation message based on the language of dict,
whether there are others in the same language, and whether games are
using that language or that dict.
2011-09-08 21:36:15 -07:00
Andy2
528db479b5 bunch of changes whose original purpose was to allow me to deal
correctly with having the same dict stored in more than one place.
Added DictAndLoc with members name and loc to support this, and used
in a bunch of places in place of mere strings, including
DictsActivity.  Also removed code warning when you're deleting a dict
that's not the last in its lang, which incorrectly warned that the
dict was in use when in fact I can't tell that.  The warning "might be
in use" sounds dumb so it's gone for now.
2011-09-08 19:10:06 -07:00
Andy2
ce8104f679 move dict-related methods from GameUtils.java to new DictUtils.java 2011-09-06 07:18:45 -07:00
Andy2
d82193ff05 don't overwrite m_gi on resuming activity as it may contain
local/pending changes.  Fixes bug where you change language, then
choose "download more..." from a player's dict choice spinner and find
on returning to GameConfig that the language has reverted.
2011-09-03 22:19:10 -07:00
Andy2
1af358b269 move code to unpack players list into same file as the code packing
it; add boolean, now always passed as false, to code printing names
for game config list of players to include the dictionary.  It's
useful for debugging, and I think it'd make a good optional setting,
but nobody else thinks so.  Once it's checked in the change can go if
I'm not using it.
2011-09-03 21:05:08 -07:00
Andy2
a3566bc063 Fix bug: the CurGameInfo instance being used to generate the list of
dicts passed when opening a game was based on defaults, not read in
from the game data.  Oops.  So now it's a two-step process: open the
data, read in the game info, generate list of dicts from that, and
open full game with list of dicts.  (TODO: optimize by caching game
data across multiple reads.)
2011-09-03 20:31:03 -07:00
Andy2
471199ba2f cleanup -- no code change beyond ordering and renaming. 2011-09-03 19:41:36 -07:00
Andy2
9956bc417d fix bugs: chosen dict was being pulled by index from non-sorted
version of the list user saw when choosing the index. Fix is to use
same list. Cancel after selecting dict didn't work as the selection
listener had already copied the selected dict name over.  Now the
listener leaves that for the Ok button's onclick listener.
2011-09-03 19:38:52 -07:00
Andy2
3fd0bb056a when there's no move made yet to display after score entry held say
so.
2011-09-02 19:24:42 -07:00
Andy2
2d2f3e23fd change signature of util_playerScoreHeld(): pass player num rather
than formatted text. Client code can use new
model_getPlayersLastScore() or whatever else it wants to build text to
show the user.
2011-09-02 18:36:03 -07:00
Andy2
42950c38bd export model_getPlayersLastScore() 2011-09-02 18:33:34 -07:00
Andy2
9cf7e6ca18 get rid of util_setInTrade() 2011-09-01 19:53:03 -07:00
Andy2
5d08b6b3cd don't make scoreboard entries translucent during trade if option to
change which player is shown is enabled.
2011-09-01 19:52:36 -07:00
Andy2
934daab6c8 don't need util_setInTrade. There's already code passing the result
of game_getState() in after every draw() call and it has an inTrade
ivar.  Use that.
2011-09-01 18:53:38 -07:00