Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-06 05:24:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4542 commits 21 branches 243 tags 33 MiB
Commit graph

4512 commits

Author SHA1 Message Date
Andy2
4d31c9cbe5 update release notes 2011-05-03 18:55:51 -07:00
Andy2
a87f90b6e9 up version for b26 2011-05-03 18:47:16 -07:00
Andy2
b4bfea0d93 handle missing-dict downloads through DictsActivity too. Now 
everything routes through that class via static methods that kick the
activity off if needed.
 2011-05-03 18:25:46 -07:00
Andy2
6e973ba48d tweak wording 2011-05-02 18:40:35 -07:00
Andy2
0b7891ad8f look in sd dir too when asking if file exists 2011-05-02 18:33:19 -07:00
Andy2
d11ef3c390 From game config's download-more spinner items, launch DictsActivity 
rather than a separate download.  This uses DictsActivity's query for
where the downloaded item should be stored.
 2011-05-02 08:04:04 -07:00
Andy2
7cf412dd50 implement test for presence of external storage; don't crash if not present. 2011-05-02 07:39:07 -07:00
Andy2
5886f0ed85 cleanup; use dialog id from the right range. 2011-04-30 15:23:36 -07:00
Andy2
0171d0ccb2 inval new file from main thread after async task finished. Seems to 
prevent attempts to read file while it's still being written (but only
on external storage.)
 2011-04-30 15:23:14 -07:00
Andy2
e1e181949e offer user a choice between using internal and external storage when 
downloading dicts.  Still to do: check if external is available before
offering; and either remove ability to download from within config
dialog or offer that choice there.  Or just use a preference to
determine where storage happens.  Also, on emulator game hangs during
download when using external storage.
 2011-04-30 14:28:35 -07:00
Andy2
8caefef406 test for null lock. Market reports a NPE that this fixes, though it 
can only happen if an onClick handler gets called after onPause().
Assuming that's true, this fixes it.
 2011-04-29 18:58:02 -07:00
Andy2
f53f2dd224 remove GameConverter -- it's been months 2011-04-29 06:40:00 -07:00
Andy2
e89c6f94b6 update with changes since b24 2011-04-29 06:39:34 -07:00
Andy2
d49a20867a new default robot dictionary 2011-04-29 06:25:16 -07:00
Andy2
deeb2f3cba fix compile-command 2011-04-29 06:24:41 -07:00
Andy2
61c33ca783 new smallish English dictionary. See the Makefile for origins. 2011-04-29 06:24:25 -07:00
Andy2
02f23ac1ec In list item loading async task, don't wait on lock. Give up if it's 
not available and wait to be called again.  Fixes occasional assertion
failure when lock held for even five seconds.  Screen jerks around a
bit but otherwise seems to work well.
 2011-04-28 21:08:24 -07:00
Andy2
ba026f761d get rid of unused parameter 2011-04-28 18:47:16 -07:00
Andy2
2572af039d fix NPE by refusing to calc font info when don't have char set, and by 
resusing to draw when don't have font info.  Until other bugs got
fixed this must meant lots of all-white boards, and it's not strictly
necessary, but is an improvement.
 2011-04-28 18:43:18 -07:00
Andy2
09100dcb2c track lang code of last dict sent and don't send repeats. 2011-04-28 18:41:39 -07:00
Andy2
3b3a822dcc a gmae may have several dictionaries in several places, but all should 
share the same language.  So pick one to send to draw_dictChanged
rather than sending all (some of which may be null.)
 2011-04-28 18:40:44 -07:00
Andy2
2886458814 assign dicts in constructor. Makes new games have the right dicts 
even if not configured after, assuming defaults are set.
 2011-04-27 06:51:30 -07:00
Andy2
9013897a5a assign dicts as soon as language is changed. 2011-04-27 06:39:52 -07:00
Andy2
399fc081d7 add menuitem to set default robot dict. 2011-04-27 06:38:45 -07:00
Andy2
17fd65fb2d list cur value for robot dict too 2011-04-27 06:38:07 -07:00
Andy2
0c9d33da3f Add infrastructure to sort dicts by wordcount so robot can have 
smallest and human largest.  Sorting works.  Still need to fix when
new dicts get assigned after lang change -- too often all players wind
up inheriting the default.
 2011-04-26 18:59:11 -07:00
Andy2
a5fd4cef30 move setRemoveOnDismiss into delegate, and call it from a dialog 
that's been crashing when called from performRestoreInstanceState.
The hope is that this will prevent the crash by forcing the dialog to
always be recreated.  But it may be that I just need to test for
m_missingDictNames being null....
 2011-04-26 18:26:21 -07:00
Andy2
83f2882589 what I mean to check in (without commented out stuff) 2011-04-26 06:43:06 -07:00
Andy2
4113d92be7 need to replace the main dict too 2011-04-26 06:41:31 -07:00
Andy2
33c81ec7ec check for null to fix NPE. 2011-04-25 21:08:51 -07:00
Andy2
7a5920e9f2 use game dict if no player dict (to avoid NPE) 2011-04-25 21:01:15 -07:00
Andy2
ecc5357ef8 up version info, and collapse two locations into one resource entry. 2011-04-25 20:46:23 -07:00
Andy2
024f7e0541 per-gi dictName matters again: preserve it, include it in lists passed 
to jni, and don't bother to assign a per-player dict when it'd be the
same as the game dict.  Allows many games to have just the one, and
also fixes problems opening games saved with older versions.  Duh.
 2011-04-25 20:24:56 -07:00
Andy2
af08b2e5b0 add a couple of asserts 2011-04-25 20:17:54 -07:00
Andy2
bf67a88c5a expect the array of dicts passed to include the game dict (as part of 
changes to always have a game dict and to have player dicts only when
they're different.)
 2011-04-25 20:16:38 -07:00
Andy2
6aa0d38c45 don't call through to java draw_dictChanged unless it's for the main 
game dict.
 2011-04-25 20:15:34 -07:00
Andy2
9d973cca15 load summaries for game list items via async tasks whenever a cached 
View isn't present.  Fixes failure to redraw after changing language,
and also should speed inital load.  Needs testing.
 2011-04-23 22:58:11 -07:00
Andy2
e9fadd4d96 Rework list item code to deal with when the summary isn't available: 
have update icon hidden by default, and print the game name (which we
know.)
 2011-04-23 18:19:35 -07:00
Andy2
20ec6dd011 Avoid relocking game after downloading: don't set lock checkbox 
in onResume() unless it's the first time through.
 2011-04-23 07:51:31 -07:00
Andy2
3c30cbd23a move ownership of language and dict lists used in spinners into 
DictLangCache where they can be updated when a dict is added via the
"download more..." item (inclusion of which is a hack.)  Now as soon
as you return to the spinner after downloading you'll have the new
dict or lang to choose.
 2011-04-23 07:39:56 -07:00
eehouse@eehouse.org
325ac65c05 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-04-21 18:44:46 -07:00
Andy2
60922baf72 bunch of changes moving UI from using one dict per game to one per 
player: remove dictName from CurGameInfo and GameSummary classes and
from DB; deal with missing dicts (the warning, fetching and replacing)
when opening games and deleting dicts.  Etc.  Trivial testing passes.
 2011-04-21 18:37:11 -07:00
Andy2
3970a3ef8a no need to make new string to copy since they're immutable 2011-04-21 18:35:10 -07:00
Andy2
c814226a08 get rid of gi.dictName: don't pass it across the jni boundary 2011-04-21 18:29:37 -07:00
Andy2
4e7570020f remove mistaken (I think) assert 2011-04-20 22:13:44 -07:00
Eric House
1ab5aa02b9 Makefile for new dict containing 4288 words: good for the robot. 2011-04-14 22:09:44 -07:00
eehouse@eehouse.org
5a21aea2e5 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-04-13 06:58:58 -07:00
Eric House
3cc105da0b add ability to dump board (model) as text, protected by ifdef that 
will likely only get set on Linux.  Uses lower-case to designate
blanks.  For that and maybe string size assumptions is very broken for
non-ascii languages, including Spanish.
 2011-04-13 06:45:22 -07:00
Eric House
0474fda127 reverse (back) sense of show-other option 2011-04-13 06:41:49 -07:00
Eric House
baedbdff2c remove logging 2011-04-12 22:17:56 -07:00
Eric House
92ac25ed3f don't require MAX_NUM_PLAYERS==4 2011-04-12 22:17:45 -07:00
Andy2
002bb40a09 report counts/values using language rather than dictionary name. To 
support that, pass lang name from java into jni.
 2011-04-11 18:55:42 -07:00
Andy2
40116d792f format "game_name (lang)" using string in resource. 2011-04-11 18:52:10 -07:00
Andy2
3c0cf176ef show language as part of game name, not dict as separate line 2011-04-11 06:54:31 -07:00
Andy2
3fb368692c dammit -- proofread those checkins! 2011-04-11 06:52:07 -07:00
eehouse@eehouse.org
819adbe236 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-04-11 06:43:00 -07:00
Andy2
c6cd60deef Save and restore per-player dicts; load games that have 'em correctly. 
Robots default to BasEnglish dict and humans to CollegeEng.  Add new
per-game default for robot dict.  Still need to deal with language
changes and non-English case in general.
 2011-04-11 06:42:17 -07:00
Andy2
96254ad8b5 when opening saved game, notify draw of per-player dicts as well as of 
a single game-wide one.
 2011-04-11 06:39:31 -07:00
Andy2
092dfdd590 not supposed to be checked in with debugging on 2011-04-11 06:33:31 -07:00
Andy2
2b3398e6a2 pass Context in constructor rather than to methods that need it 2011-04-11 06:31:48 -07:00
Andy2
dc70db5ba4 catch up with API change 2011-04-11 06:16:25 -07:00
Eric House
d6165deb47 anything beyond the 15th char in a bonus-square line is a comment (ignored) 2011-04-10 13:13:45 -07:00
Eric House
26eadb3b99 add commandline option to set bonus square pattern via an external 
file.  (Effects only Linux versions.)
 2011-04-10 13:04:05 -07:00
Eric House
3310645a12 test files for new bonus-squares-settable feature 2011-04-10 13:02:45 -07:00
Andy2
4272686034 Makefile for new smaller Dutch wordlist 2011-04-08 22:13:31 -07:00
Andy2
97d54c86eb snapshot: track dictName per player in addition to per game. Not yet 
used yet; need to pass into jni next.
 2011-04-08 06:50:08 -07:00
Andy2
fc4e454d92 bugfix: add background to set of colors restored. 2011-04-08 06:17:35 -07:00
Eric House
c77d3039cc add XP_FREEP. Should be no change in behavior. 2011-04-07 18:07:45 -07:00
Eric House
0ce963336a Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-04-04 16:16:09 -07:00
Andy2
55221c70b0 fix for new API 2011-04-03 21:51:51 -07:00
Andy2
3b7b4802a9 add ability to specify, track and use separate dictionaries for each 
player.  Works for gtk client.  Compiles for Android but there's no UI
yet to specify more than one dict.  Management of dupicate dicts
without duplicating memory -- refcounting -- will be up to the
platforms.
 2011-04-01 19:57:10 -07:00
Eric House
b5746eece9 color tray divider 2011-04-01 18:16:04 -07:00
Andy2
d430e158ba add commandline flag for phonies 2011-04-01 17:36:04 -07:00
Andy2
f64257752f fix failure to draw timer in different player color when it has same 
value as previous timer, e.g. when you're tapping on players who
haven't had a turn yet.  Note that without the test to prevent drawing
the same timer hints are broken -- device is too busy to make progress.
 2011-04-01 07:49:31 -07:00
Andy2
f6be6222a1 draw timer in player color 2011-04-01 07:22:40 -07:00
Andy2
6584c69df1 add and honor preference for board background color (e.g. scoreboard 
and tray when no tile present).  This may allow a light-on-dark theme.
 2011-04-01 07:17:11 -07:00
Andy2
a64bad0b73 just make network icon the height of scoreboard (not tested on tablet, 
the place where this was last changed)
 2011-04-01 07:14:04 -07:00
eehouse@eehouse.org
32143d8116 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-03-31 18:19:31 -07:00
Andy2
9f76bdede9 hold mutex for slightly shorter time 2011-03-31 18:16:56 -07:00
Eric House
27346cf58b change AIP to remove several stored messages at a time. Will use 
later to delete messages after proxy fetches and ACKs them so traffic
isn't repeated.
 2011-03-31 18:15:03 -07:00
Eric House
7aeb0a4df0 make default socket timeout 5 seconds, not 20. 2011-03-31 18:13:16 -07:00
Eric House
c30dd905a2 move getting user strings into impl so available in background. Fixes 
bug where trades were not reported when received from relay via proxy.
 2011-03-31 18:11:36 -07:00
Eric House
13b5acf8b5 changes log updated 2011-03-31 18:07:02 -07:00
Andy2
cd4ddd5dbb fix help 2011-03-31 06:41:39 -07:00
Andy2
379538fd7e show robot/remote scores by default 2011-03-31 06:41:34 -07:00
Andy2
80e0edbf03 cleanup 2011-03-31 06:41:11 -07:00
Andy2
21ab1d6d55 constants: toward beta 24 2011-03-30 18:58:06 -07:00
Eric House
67a3349919 Don't move arrow on pen-up if pen-down was in a different cell. 2011-03-29 18:13:38 -07:00
Eric House
f4ea54c30b cleanup; no behavior change 2011-03-29 18:12:55 -07:00
Eric House
1caddcf39b no need to request orientation when it never changes 2011-03-15 06:17:00 -07:00
Eric House
553bee4956 replace fwrite etc with write so fsync can be added before close. 2011-03-14 18:56:17 -07:00
Eric House
bcf767d66e fix NPE in race; no longer any need to set preferred orientation; do a 
bit of asserting trying to catch another race.
 2011-03-14 18:34:00 -07:00
Eric House
58cb40b08e claim to handle keyboardHidden change so it'll be ignored. 2011-03-14 18:32:36 -07:00
Eric House
c0dd42d0ba let's see if not claiming to handle orientation changes stops Samsung from ignoring my portrait-only setting. 2011-03-14 06:57:17 -07:00
Andy2
8bb2857e63 The relay is hanging inside recv(). Use setsockopt to set a 20-second 
receive (and send) timeout on all sockets accept() returns.  Sockets
that timeout should then get closed and dropped.
 2011-03-12 05:13:54 -08:00
Andy2
58ff3189a0 remove layout and code allowing toolbar to be positioned in landscape 
mode.
 2011-03-12 04:15:57 -08:00
Andy2
257d7cf094 set requested screen orientation. Seems to prevent going into 
landscape mode when keyboard opened.
 2011-03-11 21:52:37 -08:00
Andy2
84d0823341 prevent board from displaying in portrait mode. 2011-03-11 19:07:05 -08:00
Andy2
01fe8f6087 don't ping relay every time app is launched -- timer is enough. 2011-03-11 19:06:42 -08:00
Eric House
9b99183d2c update for b23 2011-03-11 18:06:43 -08:00
Andy2
e7ab1c34b7 add more carriage returns for history formatting 2011-03-11 06:52:43 -08:00
Andy2
a280fe7e3e remove localized format strings identical to that causing crash in English 2011-03-11 06:47:29 -08:00
Andy2
552a5ff6da up constants for beta 23 2011-03-11 06:45:49 -08:00
Andy2
28f3ad316b hide/show hint at top of games list via a preference rather than the 
number of games in the list, and modify hint text to point to the
prefs setting.
 2011-03-11 06:44:25 -08:00
Andy2
c909f91a61 fix over-long initial trays in history by adding <cr>. Not sure if 
line brakes belong in common code or strings however...
 2011-03-10 19:00:15 -08:00
Andy2
d6dd2b942f fix crash tapping player name after a trade -- since the format string 
was wrong.
 2011-03-10 18:56:13 -08:00
Andy2
492e086311 break the hint into two so goes-away part can be smaller. 2011-03-10 18:34:02 -08:00
Andy2
d56ce42585 hide games-list hint when more than 2 games present, and add text to 
that effect so people aren't surprised.
 2011-03-10 18:24:27 -08:00
Andy2
d9bb5197d4 Add two new menus to be available only when in trade mode. Hide and 
show them and another group depending on whether trading at the time.
To make that work, replace the individual calls made to dis/enable
toolbar buttons with a single jin call that takes a struct full of
booleans and make that struct available in BoardActivity where menus
are hidden/shown.  Remove the individual calls from the jin interface.
 2011-03-10 18:13:56 -08:00
Andy2
26a274ab0f make the empty-list message a header instead since its instructions 
matter after there are games in the list.  But hide it whenever there
are four or more games.
 2011-03-09 18:42:06 -08:00
Andy2
bfc5bb62dc don't call nobody dumb, even a robot. 2011-03-08 21:58:12 -08:00
Andy2
8ef3aa51b2 Reverse sense of is-local bit so that on upgrade people don't see all 
their local players marked as remote.
 2011-03-08 18:43:29 -08:00
Andy2
678cbe1dea fix plural and make name consistent 2011-03-08 18:42:45 -08:00
Andy2
fc4fddb055 check if can hint (to refresh buttons) after enter/leaving trade mode 2011-03-08 07:41:16 -08:00
Andy2
aa88503cfb have board_canHint() return false when trade in progress. 2011-03-08 07:40:38 -08:00
Andy2
15ef9c4fd2 add prompt to dict-pick spinner 2011-03-08 07:31:11 -08:00
Andy2
7de951f149 update with changes from b21 2011-03-08 07:13:14 -08:00
Andy2
9acea8ec5a fire a toast in response to "check relay" menu so people get sense of 
something being done.  Firing from RelayService might be more honest
but is much harder.
 2011-03-08 06:33:22 -08:00
Andy2
9dd69015cc say "relay", not "server" 2011-03-07 21:37:56 -08:00
Andy2
133079e200 tweak newbie message for new local game creation 2011-03-07 21:14:47 -08:00
Andy2
0225bf215b change text of add-game buttons to be (says Deb) clearer 2011-03-07 20:47:49 -08:00
Andy2
b2db1a0936 don't call remote player robot 2011-03-07 20:44:31 -08:00
Andy2
b441fdb56e make hint text bigger and proportional to cell size. 2011-03-07 20:29:44 -08:00
Andy2
a6edcaadd9 zoom by five instead of four 2011-03-07 20:26:08 -08:00
Andy2
2f3a1b03f5 cleanup 2011-03-07 20:23:47 -08:00
Andy2
5c2d0a064c Better exchange miniwindow text. But more needed after fixing 
BoardView code to better format.
 2011-03-07 06:41:17 -08:00
Andy2
8c40628916 Support new error message about exchange being disallowed when no selection. 2011-03-07 06:40:11 -08:00
Andy2
54f2ae3edf error string for: fire user error rather than committing turn when 
trade attempted without any tiles selected.
 2011-03-07 06:29:40 -08:00
Andy2
828bd9aa4c fire user error rather than committing turn when trade attempted 
without any tiles selected.
 2011-03-07 06:28:43 -08:00
Andy2
0e86467ea1 use high-contrast for mini-window (same as arrow) 2011-03-05 23:21:38 -08:00
Andy2
58d29fbb26 a bit of cleanup: inval rather than replace 2011-03-05 15:38:03 -08:00
Andy2
81e3578dd5 Fix another recycled dialog message by making superclass dismiss 
listener adder available and using it.
 2011-03-05 10:16:29 -08:00
Andy2
92a726aff3 call removeDialog() when dismissing blocking dialogs. Fixes reporting 
the same robot move every time.
 2011-03-05 10:05:31 -08:00
Andy2
166bee6c82 always show game name (for now) 2011-03-04 21:33:26 -08:00
Andy2
b0b747f642 remove logging around GameLock 2011-03-04 18:53:47 -08:00
Andy2
997365bc20 new printStack() required for prev commit 2011-03-04 18:36:53 -08:00
Andy2
4cdafbd510 reduce the length of the sleep when waiting for lock; add code to 
capture stack trace at lock time that'll be printed out along with the
current thread's trace when I can't get a lock in one second.  I'll
comment that out shortly but want it for debugging -- though it's
untested: can't repro any failure to lock now.
 2011-03-04 18:36:33 -08:00
Andy2
2b28a4d27c unlock GameLock before launching BoardActivity -- to fix a deadlock. 
Also do lock/unlock in onPause/onResume rather than onStart/Stop to
hold the lock for a shorter time.
 2011-03-04 18:22:17 -08:00
Andy2
1b6d8ebed2 don't show game name if it's hidden in BoardActivity -- that is, use 
the same preference to govern both.  Still to do: need to inval all
game list items when that preference changes.
 2011-03-04 07:40:56 -08:00
Andy2
2fdda2bae1 move game_name to its own row at top so it serves as title. 2011-03-04 07:39:54 -08:00
Andy2
754d7b06ef add boolean 'wait' to getSummary() allowing it to return null if it 
can't get a read lock.  Fix GameListAdapter to handle that null.
 2011-03-04 07:22:08 -08:00
Andy2
abdabd9c3c don't pass timeout value to join() when stopping jni thread. If the 
timeout fires there's nothing I can do anyway.  So it it take as long
as required to exit run(), and if that's too long fix it.
 2011-03-04 07:19:06 -08:00
Andy2
b085540ee3 make the jni thread a daemon per recommendation from google dev suppt. 2011-03-04 07:14:17 -08:00
Andy2
f21ddedc59 go back to singleTop for GamesList to see if it fixes the occasional 
Activity duplication I'm seeing on-device.
 2011-03-04 07:13:00 -08:00
Andy2
a5ba0ac5fe remove pending messages after sending them. 2011-03-04 06:38:25 -08:00
Andy2
a1d1251c0e remove logging 2011-03-04 05:46:20 -08:00
Andy2
6acf7fda68 fix crash: rather than pass chat message to jnithread that will be 
null when the board activity has lost focus, save it to be sent once
the thread's been recreated.
 2011-03-04 05:45:29 -08:00
Andy2
eb3b83ec48 fix rare crash by tracking whether showDialog has been called and 
testing that before dismissing it.
 2011-03-03 19:00:50 -08:00
Andy2
ecfe1d110e Make getSummary able to fail since it can be called when somebody has 
a write lock that will be held for a long time.  One place it'll fail
is when game list item's been invalidated and wants to update.  Deal
with null summary coming back there.
 2011-03-03 06:52:20 -08:00
Andy2
c6fc912d89 reimplement GameLock without ReadWriteLock which isn't quite what I 
wanted (which is more like a checkout mechanism).  Lots of logging
remains to be removed.
 2011-03-03 06:50:48 -08:00