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

4527 commits

Author SHA1 Message Date
Andy2
c9be5b464c actually set the creation timestamp 2011-05-20 22:51:30 -07:00
Andy2
13e8667634 use Player %d when no default player name set 2011-05-20 06:51:13 -07:00
Andy2
3df47f8fe2 separate string for missing player 2011-05-20 06:50:38 -07:00
Andy2
815490fb87 update gi before creating summary. In case of networked game, 
incoming messages may have changed the version inside the jni
(reordered or renamed players) and we want those changes in the
summary.
 2011-05-20 06:44:06 -07:00
Andy2
d554f71e8a cleanup: move invariant out of loop 2011-05-20 06:39:39 -07:00
Andy2
a29f08616e what I meant to check in. 2011-05-19 22:53:58 -07:00
Andy2
232e4ec1e9 track missing players -- players for whom space is reserved locally 
and whose names have not yet been received from host/server -- as part
of summary.  They can be drawn differently to give a clear visual
indication which games are not in play and for which the user might
want to issue an invitation.
 2011-05-19 22:53:04 -07:00
Andy2
0b2ca44fa9 we need *name and *namef forms 2011-05-19 22:50:39 -07:00
Andy2
89911ecaa4 add server_getMissingPlayers to return a bitvector indicating players 
not yet received on device.  Meant to be included in summary.  I'm not
happy with how much code it took to figure this.  I don't know
server.c all that well any more.
 2011-05-19 22:48:21 -07:00
Andy2
0f45c26aea remove, for now, test that prevents multiple games from a single email 
so on-device testing possible.  Later need to improve the test.
 2011-05-19 06:54:46 -07:00
Andy2
362eb10d9d remove, for now, test that prevents multiple games from a single email 
so on-device testing possible.  Later need to improve the test.
 2011-05-19 06:54:27 -07:00
Andy2
7349a61f5a add market url to install and break ugly/non-localized url out of 
localized strings.xml.
 2011-05-19 06:52:42 -07:00
Andy2
4c5c435fb5 add new parameter so client always gets notified on connection 
including how many players are still missing.
 2011-05-19 05:51:00 -07:00
Andy2
0c3a6d362c when a networked game connects and is missing player, offer to invite 
someone.  Factor out code from create-and-invite path to support this.
Move invite-related strings into resources.  Still untested with
networked device (to send email.)
 2011-05-18 19:00:32 -07:00
Andy2
71afbf617c add empty view so screen is never completely blank 2011-05-18 06:28:44 -07:00
Andy2
55278ab2a2 what I meant to check in. 2011-05-17 18:44:57 -07:00
Andy2
bf4b3c3058 fix hint text to mention only one button, hide that button along with 
the text -- and make the add-game menu item actually work.
 2011-05-17 18:44:34 -07:00
Andy2
7389b3b4c8 disable the three unused name prefs 2011-05-17 18:26:53 -07:00
Andy2
0763e7d5b3 put the two dictionary settings into their own subscreen -- like 
player names.
 2011-05-17 18:20:21 -07:00
Andy2
bc3e5b5ca4 add defaults for first through fourth player names. Apply them only 
to local, non-robot players, which at the moment means only the first
will get used.  Not sure what the right strategy is now so maybe all
but the first goes away.
 2011-05-17 18:12:23 -07:00
eehouse@eehouse.org
574194cb4f Merge branch 'android_branch' into android_invite 2011-05-16 19:38:25 -07:00
Andy2
9cc2dfca34 include language in set-default-dict message to reinforce connection 
between dict and language.  I really want to lock the two defaults --
force to change both if one is a different language -- but am not sure
it that's easy enough to do quickly (for next beta.)
 2011-05-16 17:58:31 -07:00
Andy2
903b412046 add note that storage location decision isn't permanent 2011-05-16 17:37:52 -07:00
eehouse@eehouse.org
2fae0842c4 Merge branch 'android_branch' into android_invite 2011-05-16 06:44:04 -07:00
Andy2
740c5dd46c up constants and change message for new release 2011-05-16 06:43:42 -07:00
Andy2
6b4320e727 start to fill in text for new-game dialog. 2011-05-16 06:35:49 -07:00
Andy2
3762fc07d1 express size in K (rounding up) 2011-05-15 08:02:06 -07:00
Andy2
94f582cdc0 switch size and wordcount columns 2011-05-15 08:01:36 -07:00
Andy2
332767105c express size in K (rounding up) 2011-05-15 07:37:29 -07:00
Andy2
7ccacdc26d switch size and wordcount columns 2011-05-15 07:28:10 -07:00
Andy2
a89d81587d Merge branch 'android_branch' into android_invite 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2011-05-14 11:54:31 -07:00
Andy2
53f1bc8858 fix to use positional params in format strings 2011-05-14 11:44:13 -07:00
Andy2
ba6968c937 remove strings no longer used 2011-05-14 11:29:05 -07:00
Andy2
c996e98624 replace two menuitems, default-robot and default-human, with a single 
that invokes a dialog giving an explanation and three choices: robot,
human and both.
 2011-05-14 11:04:19 -07:00
Andy2
54a793f6c2 fix to use positional params in format strings 2011-05-14 10:25:58 -07:00
Andy2
6ee8c171be implement moveDict and redraw row with new location if successful. 2011-05-14 10:12:30 -07:00
Andy2
aedc3c6cdc fix title -- not showing wordcount any more 2011-05-14 10:10:24 -07:00
Andy2
f914a15b97 comment field GONE by default; revealed when used 2011-05-14 10:07:34 -07:00
Eric House
c99093fb35 Merge branch 'android_branch' into android_invite 2011-05-11 22:04:06 -07:00
Andy2
fe1bec74f5 add context menuitem to move dicts, dialog to confirm, and call 
stubbed-out method to do the actual move.  Still need a title and to
inval so gets redrawn (and to implement the actual move.)
 2011-05-11 19:01:13 -07:00
Andy2
644100a005 Add generic Object cache to work around being unable to subclass an 
object that's defined in a layout file (class cast to the subclass
fails, as you'd expect.)  Will use this to cache a dict's location.
Eventually there needs to be a DB for dict details.
 2011-05-11 18:59:41 -07:00
Andy2
e51b6f3322 add dict's locations to display 2011-05-11 18:07:07 -07:00
Andy2
19ed409dda add notion of dict location, method to get it, and rewrite a couple of 
others to use that.
 2011-05-11 18:06:43 -07:00
Andy2
7d38a629b5 add comment field to XWListItem and its layout. Get elements by id 
rather than position.
 2011-05-11 18:05:41 -07:00
Andy2
8b130521fa Merge branch 'android_branch' into android_invite 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2011-05-10 18:55:13 -07:00
Andy2
b4b54c5fb9 quick hack to open up all groups. Need eventually to remember how 
user sets 'em.
 2011-05-10 18:52:47 -07:00
Andy2
ec1e8674ec replace placeholder language names with empty strings so, maybe, can 
elect not to display
 2011-05-10 18:36:48 -07:00
Andy2
782a9f1f70 get rid of strings that don't seem to be used anymore. Still need to 
pull from localized files.
 2011-05-10 18:36:04 -07:00
Andy2
af96e184d7 don't refresh public room names when game is locked. 2011-05-10 18:34:39 -07:00
eehouse@eehouse.org
bad8a5e19b Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-05-10 18:30:00 -07:00
Eric House
dd27a0ebcd first cut at script to do stuff with xml string resources, e.g. find strings that aren't used 2011-05-10 18:26:54 -07:00
Andy2
8a8e1c9db0 remove no-op method and call of same 2011-05-10 18:25:27 -07:00
Andy2
472ffd02bf fix getting wrong networked window title even when configuring a 
non-networked game.  And remove no-op method call.
 2011-05-10 18:24:57 -07:00
Andy2
75e41caf90 go back to using XWListItem (with its delete-me X) and get rid of 
delete context menu item.
 2011-05-10 06:31:09 -07:00
Andy2
2dbf1ac489 add formatted=false to postpone fix suggested by new version of SDK 2011-05-10 06:27:58 -07:00
Andy2
085748e201 hook up context menus, and add a delete item to replace the 
checkboxes.  Still need to disable it when dict is built-in.  And
maybe add a different menu for languages.
 2011-05-09 18:59:51 -07:00
Andy2
c990900913 cache list of langs. Performance is otherwise abysmal. May need to 
add mechanism to notify when the list is invalidated.  (Or move
caching into DictsLangCache class.)
 2011-05-09 06:49:45 -07:00
Andy2
a559fdaae9 use a built-in layout for top-level rows to get the expander drawn right. 2011-05-09 06:32:30 -07:00
Andy2
9dfcb2dda2 first step toward using an expandable list for dicts browser, with 
languages as first-level items each containing all of the dictionaries
in that language.  This is a snapshot: it's broken visually and
functionally.
 2011-05-08 22:50:42 -07:00
Andy2
129a9e97ef fix compile error 2011-05-06 19:01:15 -07:00
Andy2
d407880dc1 complete the work of handling an incoming intent sent via a 
new-game-invite URI.  Seems to work, but requires two devices to test.
 2011-05-06 18:56:30 -07:00
Andy2
249402758a add new activity for starting a new game. Has four buttons and 
(eventually) explanatory text.  Currently more-or-less works,
including sending an email with a link that when clicked launches
Crosswords.  (Still need to respond to that link on receipt, but I'm
at least pulling out the necessary fields.)
 2011-05-06 06:52:10 -07:00
Andy2
77bf5e2d36 php file to be run on server to enable via redirection clickable links 
in SMS app that will launch Crosswords.
 2011-05-06 06:49:43 -07:00
Andy2
f05e02144c move setting gameID (if not already set) to creation of C version of 
the struct so it always happens, and also set it back into the java
version at the same time.  Makes creation of new games easier.
 2011-05-06 06:47:44 -07:00
Andy2
2294159c7c change sufficient to get a custom scheme in browser to launch me. Had 
to duplicate an activity element which is bad and maybe won't work
everywhere so try to fix this.  But this *does* work in 2.2 emulator.
 2011-05-04 19:04:02 -07:00
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