Andy2
f41d3c27e6
Merge branch 'android_branch' into send_in_background
...
Conflicts:
xwords4/common/server.c
2011-10-19 06:23:16 -07:00
Andy2
d63f6961d4
fix log comment to correctly identify site.
2011-10-18 21:29:59 -07:00
Andy2
90b0a4e46f
if words stream is null, don't pass into java code (where current impl
...
will get a NPE)
2011-10-18 21:28:50 -07:00
eehouse@eehouse.org
b8adbd94c1
Merge branch 'android_branch' into send_in_background
2011-10-18 06:47:38 -07:00
Andy2
028c416587
don't disable player listing when game is in play and locked; allow
...
users to see info about players and change dict.
2011-10-18 06:46:46 -07:00
Andy2
71fabdac95
add changelist change
2011-10-18 06:35:26 -07:00
Andy2
214debca47
up strings for beta 37
2011-10-18 06:16:15 -07:00
Andy2
ff82c20b2c
fix brokenness (black-on-black text in lookup dialog) on 2.2 and
...
beyond by copying in layout for built-in list items and hard-coding
white text color. This is risky/fragile but I can't find another fix.
2011-10-17 21:33:11 -07:00
Andy2
dc84cfcb97
cleanup/reformat. No code change.
2011-10-17 20:27:51 -07:00
Andy2
29eec38821
remove unused strings
2011-10-16 17:59:00 -07:00
eehouse@eehouse.org
5afb0ae145
Merge branch 'android_branch' into send_in_background
2011-10-14 22:34:29 -07:00
Andy2
6793742f0f
remove option to list all words played in a single lookup dialog, and
...
supporting code in the jni/common C.
2011-10-14 22:32:30 -07:00
Eric House
46392da205
Fix crash when password dialog comes up second time: don't be cute and
...
reuse custom views as they remember their parent and that needs to be
cleared. Just recreate each time and let gc() do its job.
2011-10-14 19:07:19 -07:00
Eric House
851b2d296f
Should have gone with last checkin: delete of file due to renaming.
2011-10-14 19:05:07 -07:00
Eric House
e848b150b5
rename LookupActivity->LookupView since it's not an Activity any more.
2011-10-14 18:45:47 -07:00
Eric House
0b54b190b6
make lookup dialog a mere dialog rather than an activity to fix
...
too-slow transitions to and from it. Works by keeping code in
separate custom view and not setting buttons or anything else on the
dialog.
2011-10-14 18:39:39 -07:00
Andy2
0e6b4d749f
When pen held on committed tile on board, cons up list of all words
...
played that include that tile and pass to new util_cellSquareHeld()
method. In java implementation of that method, use existing lookup
activity code to display list of words. Enabled on the C side by a
compile-time flag in case it has problems. Right now the time spent
saving a game before launching the lookup activity, and reloading it
after, is pretty apparent, but that's in emulator which is slow.
2011-10-13 19:14:08 -07:00
Andy2
01459285d5
show dict as comment beside player name in players list. And since
...
dicts change when language does, put language choice above players
list.
2011-10-12 18:37:31 -07:00
Eric House
861a24dfeb
Merge branch 'android_branch' into send_in_background
2011-10-10 22:42:28 -07:00
Andy2
9551f29335
up strings for beta 36. I'm skipping b35 rather than try to move the tag.
2011-10-10 22:30:38 -07:00
eehouse@eehouse.org
99707e4029
Merge branch 'android_branch' into send_in_background
2011-10-10 18:31:30 -07:00
Andy2
92a2fb1a1f
attach newbie info to the lookup button
2011-10-10 18:24:06 -07:00
Andy2
cdf57d3bb7
cleanup
2011-10-10 06:53:46 -07:00
Andy2
c3ba50c905
up strings for beta 35
2011-10-07 18:59:32 -07:00
Andy2
03543c17ea
fix NPE I got once, presumably when activity shutting down.
2011-10-07 18:59:17 -07:00
eehouse@eehouse.org
8712918e73
Merge branch 'android_branch' into send_in_background
2011-10-07 05:49:52 -07:00
Andy2
f03699f701
add newbie warning/request for languages with only google as
...
word-lookup site.
2011-10-06 19:03:07 -07:00
Andy2
f084661ec3
Never meant to check in having lookup menuitem at top level.
2011-10-06 18:47:08 -07:00
Andy2
152a9175c6
use dialog theme for lookups -- just works now, though didn't at first.
2011-10-06 18:44:59 -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
eehouse@eehouse.org
6bf8d5abeb
Merge branch 'android_branch' into send_in_background
2011-10-06 06:51:05 -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
eehouse@eehouse.org
471a9d988d
Merge branch 'android_branch' into send_in_background
2011-10-05 07:10:52 -07:00
Andy2
aaf0ba34e4
add a couple of French word lookup URLs.
2011-10-05 06:55:25 -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
dc20b04a4c
remove unused param (on the C/jni side)
2011-10-04 18:54:53 -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
eehouse@eehouse.org
82615f409b
Merge branch 'android_branch' into send_in_background
2011-10-04 06:49:19 -07:00
Andy2
f4b8b2806e
remove unused parameter
2011-10-04 06:48:53 -07:00
Andy2
5dd21a16ea
don't crash if words stream is null, as it will be when turn's a pass.
2011-10-04 06:45:16 -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
eehouse@eehouse.org
fe1bfead87
Merge branch 'two_phase_lookup' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2011-10-03 06:46:24 -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
Eric House
f0c3e2c5f0
Merge branch 'android_branch' into send_in_background
2011-09-22 17:22:01 -07:00
