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
6421 commits 21 branches 243 tags 33 MiB
Commit graph

2452 commits

Author SHA1 Message Date
Eric House
04f51bd392 add haveDict() 2012-10-17 07:10:08 -07:00
Eric House
a8c77bca88 fix NPE 2012-10-17 07:01:01 -07:00
Eric House
de5dcdc5f9 starting new variant for GCM 2012-10-16 07:41:04 -07:00
Eric House
077270f1cd merge in SMS-version UI -- there will not be a separate version for 
SMS any more.
 2012-10-15 08:29:46 -07:00
Eric House
eb47e75c50 put up more user-friendly message when dicts don't match. 2012-10-15 08:07:17 -07:00
Eric House
5f247db29c use the same missing-players message for all three connection types 
(even though the way they're reported is, though shouldn't be,
different.)
 2012-10-15 07:31:02 -07:00
Eric House
c811282591 UI change: networked games are no longer allowed to have per-player 
dicts.  Now you select a single dict for such games in a new spinner
just below the lang spinner, and player's dicts are no longer
displayed.  For standalone games, the single dict choice isn't there,
the individual dicts are displayed, and you must open a player config
to change the dict as before.  The idea is that this will be less
confusing, particularly when I need to tell the guest that the host is
using a different dict.
 2012-10-14 19:21:27 -07:00
Eric House
e90c5ee94f pass index of resigning player into util_notifyGameOver. Not yet 
passed into java.
 2012-10-09 05:31:12 -07:00
Eric House
ce58750b92 change "resign" menu text once game is over 2012-10-08 07:09:44 -07:00
Eric House
e64ecfb78d implement resign on top of existing endGame logic, adding "quitter" as 
new param passed to remote and changing final score formatting and
menu items to match.  Still need to show old menu on android in case
where game has already ended.
 2012-10-07 12:47:06 -07:00
Eric House
fd9b9f85e2 make util_hiliteCell conditional, and remove from android where it 
wasn't used anyway.
 2012-10-05 18:51:32 -07:00
Eric House
b11da9d8eb use GamesList's Handler to set timers to redraw turn expiry indicators 
when the percent left changes.  This may be done -- except for
deciding what to do when the time actually runs out.
 2012-10-02 07:30:31 -07:00
Eric House
0a60419802 make ExpiringDelegate responsible for figuring percentage of time left 
given start time and having a constant for how long a turn lasts.  Eventually
the constant will be replaced by a second number passed in.
 2012-10-01 19:07:23 -07:00
Eric House
cd776a34dd Revert "Display turn start time in game summary. This is definitely not its" 
This reverts commit ebaa22594d.
 2012-10-01 17:53:35 -07:00
Eric House
bec596c744 remove no-longer-needed drawable 2012-10-01 17:52:56 -07:00
Eric House
0579253b8d Also override TextView to show turn left there. Works, requiring only 
that actual percentage of turn remainning be calculated.
 2012-10-01 07:24:45 -07:00
Eric House
50b10cd365 new classes overriding LinearLayout to allow framing is-turn rect to 
be drawn in two colors showing how much time left for turn.  Required
because there's no (reasonably-easy) way to create nine-parts
dynamically.
 2012-10-01 06:57:40 -07:00
Eric House
8281bd7f10 call back into java for util_getCurSeconds implementation so java and 
C world are sure to be using the same clock.
 2012-09-29 19:27:02 -07:00
Eric House
ebaa22594d Display turn start time in game summary. This is definitely not its 
final form!
 2012-09-27 07:48:30 -07:00
Eric House
2c89f13383 add turn as param to util_turnChanged, and call from server rather 
than board.
 2012-09-27 07:04:57 -07:00
Eric House
94103a4212 track time of most recent turn start, and include it in summary table. 2012-09-27 06:55:46 -07:00
Eric House
65598cdb7b replace DeleteLocalRef calls 2012-09-24 07:44:43 -07:00
Eric House
140c982d41 merge from android_branch 2012-09-24 07:39:44 -07:00
Eric House
4909dde622 call a script rather than an html file so file doesn't have to be 
updated with every release.
 2012-09-24 07:35:14 -07:00
Eric House
c76c5f5868 don't create obits for apps that don't have relayIDs (and presumably 
never connected.)
 2012-09-20 07:45:04 -07:00
Eric House
96e277c7ba don't offer to copy DB from sdcard when there is none. 2012-09-20 07:29:00 -07:00
Eric House
598a154693 factor common code into function 2012-09-19 08:09:27 -07:00
Eric House
a601d0818e save and restore search prefix even when find button not clicked, and 
display last scroll position when different from what prefix finds.
 2012-09-18 07:51:50 -07:00
Eric House
210913d4d4 track dictbrowse info for multiple copies of same dict if that's 
what's installed.
 2012-09-18 07:36:54 -07:00
Eric House
fcecd1db3c don't ask for column no longer there 2012-09-18 06:38:22 -07:00
Eric House
168b69112e up version strings for pending new release 2012-09-17 06:36:58 -07:00
Eric House
33772ff0b9 remove redundant DB field and variable 2012-09-15 17:11:59 -07:00
Eric House
a939c9ec4b cleanup 2012-09-15 17:11:45 -07:00
Eric House
75398389b3 Merge branch 'android_branch' into android_dictdb 
Conflicts:
	xwords4/android/XWords4/jni/jniutlswrapper.c
 2012-09-15 16:36:15 -07:00
Eric House
ee1df7eeb7 replace DeleteLocalRef calls with version that checks for NULL 2012-09-15 15:57:38 -07:00
Eric House
937bde6378 combine two jniutils methods into one 2012-09-15 15:21:31 -07:00
Eric House
bcc8c0c249 remove code figuring md5sum on full dict file; the sum on data is all 
we're using now.
 2012-09-13 19:33:17 -07:00
Eric House
9ea1311aa0 Merge branch 'android_branch' into android_dictdb 2012-09-13 08:00:54 -07:00
Eric House
50e90405a7 add new Catalan word lookup URL 2012-09-13 08:00:37 -07:00
Eric House
aa974be567 Before figuring md5sum (via java callback added recently), use new 
callback to see if there's already one in the DB.  Required passing
context into jniutils getter, and passing name into jni dict
constructors that previously didn't need it.
 2012-09-13 07:38:08 -07:00
Eric House
edc6b9c270 Merge branch 'android_branch' into android_dictdb 2012-09-13 05:40:08 -07:00
Eric House
3e4384c2a8 when dict doesn't have built-in md5sum, or when in DEBUG code, call 
back into java to get a sum.  It's very slow for large dicts, but will
eventually be in a DB so only done once per dict that doesn't have it.
 2012-09-13 05:39:44 -07:00
Eric House
13507e6fc2 break dict info table in two, one browse state and one for what's been 
stored in static data in DictLangCache up to now -- and remove that
static data in favor of the new table.
 2012-09-12 19:50:03 -07:00
Eric House
67b0d44f26 save search prefix too 2012-09-12 07:55:41 -07:00
Eric House
ce6356fb92 add new db table for tracking dict-releated stuff. Use it to save 
state in wordlist browser so can return to same place as left for each
dict.  Eventually the new table should replace DictLangCache.
 2012-09-12 07:44:58 -07:00
Eric House
ae2b6205bd use mem_stream_make_sized 2012-09-11 19:17:27 -07:00
Eric House
0ccc2331b5 address bug where message was getting ACK'd by a device that failed to 
save what it had ACK'd leaving the game permanently broken.  Do that
by adding a new method game_saveSucceeded() called after the client
claims to have committed bytes returned by game_writeToStream() to
disk.  In that method comms updates the value it'll use in subseqent
ACKs.
 2012-09-10 07:31:45 -07:00
Eric House
95a7b14a3a transmit dict's md5sum along with name in initial message from host to 
guest.  On guest, pass that sum into client code along with names so
the appropriate tests can be done and corrections taken.
 2012-09-08 20:23:48 -07:00
Eric House
f90e6343c7 don't crash if no dict info 2012-09-08 20:22:22 -07:00
Eric House
9a72f252ed Merge branch 'android_branch' into android_dictname 2012-09-08 13:20:59 -07:00
Eric House
5a81484cf1 add md5Sum to DictInfo and add a getter 2012-09-08 10:11:18 -07:00
Eric House
50a4f32bfa new versions of dicts with checksums and descriptions 2012-09-08 10:08:39 -07:00
Eric House
077560bcd3 load md5sum if present 2012-09-08 09:42:23 -07:00
Eric House
4f180e9e14 pass rejecting dict name into java layer and display as part of turn 
lost message.
 2012-09-06 19:04:40 -07:00
Eric House
4325d4e709 Merge branch 'android_branch' into android_dictname 2012-09-05 19:30:50 -07:00
Eric House
fa90150055 Revert "As an experiment, lower case words being looked up. Apparently one of" 
This reverts commit 5bdebd445f.
 2012-09-05 19:20:05 -07:00
Eric House
4d57fb889b new and improved URL for Catalan lookup 2012-09-05 19:19:05 -07:00
Eric House
5bdebd445f As an experiment, lower case words being looked up. Apparently one of 
the Catalan sites doesn't like upper case.  At least in theory no site
should care so the rest of the world should be ok with lower case too.
 2012-09-04 19:03:53 -07:00
Eric House
270a19f3aa Revert "first of a set of changes to communicate to clients dictionary being" 
This reverts commit b7a0f1489b, which I didn't mean to check in on this branch.
 2012-09-03 21:34:51 -07:00
Eric House
ea4d805d5f first of a set of changes to communicate to clients dictionary being 
used by server.  Clients need to care if e.g. the server's disallowing
phonies based on its dict.  Can only be sent if client is of latest
version.  In that case, common code calls into new util function.  In
future changes, BoardActivity's implemention of the callback will need
to check if the server's choice of dict is available, and if not offer
to download it.  Once it's available, will want to install it.
 2012-09-03 21:33:46 -07:00
Eric House
b7a0f1489b first of a set of changes to communicate to clients dictionary being 
used by server.  Clients need to care if e.g. the server's disallowing
phonies based on its dict.  Can only be sent if client is of latest
version.  In that case, common code calls into new util function.  In
future changes, BoardActivity's implemention of the callback will need
to check if the server's choice of dict is available, and if not offer
to download it.  Once it's available, will want to install it.
 2012-09-03 21:29:21 -07:00
Eric House
d12ed144ea normalize file: add comments where don't proceed a string, and replace 
tabs with spaces.
 2012-08-31 21:36:49 -07:00
Eric House
73e29211b0 remove strings no longer used 2012-08-31 21:34:25 -07:00
Eric House
adab1b5cea replace getString() calls that fetch format strings then apply them 
with calls to the formatting (varargs) version of getString().  Should
be no behavior change.
 2012-08-30 19:18:08 -07:00
Eric House
2eb8904a0a rename to cWords-SMS, and move name <string/> into strings.xml so it 
can be substituted too.
 2012-08-30 19:11:46 -07:00
Eric House
4ffb4efb0c silence compiler warning 2012-08-30 19:10:52 -07:00
Eric House
3b8c9bfada add two Catalan word lookup URLs 2012-08-30 07:07:42 -07:00
Eric House
145317426d Fix prefix matching to accept letters constituting the first part of a 
digraph tile when at the end of a prefix so that e.g. GORIL in Catalan
will list GORIL·LA (rather than nothing since GORIL, ending with the L
tile, is not a prefix.)
 2012-08-27 21:50:09 -07:00
Eric House
da4ec16ba4 remove one-release logging confirming getInstallerPackageName result. 2012-08-27 06:15:11 -07:00
Eric House
a0e8b6c076 add description 2012-08-26 21:36:00 -07:00
Eric House
c5f21a3517 new field to be populated if dict desc header is found. 2012-08-26 21:00:21 -07:00
Eric House
08aa9b66e8 also load new desc field in android client, and add jni call to retrieve it 2012-08-26 20:59:17 -07:00
Eric House
efb7a9b5c5 call loge rather than logf from within catch statements 2012-08-23 07:08:17 -07:00
Eric House
47822e94e3 remove comment 2012-08-23 06:38:57 -07:00
Eric House
8f6486b381 add psuedo-unique device id to update messages; log installer once 
(which will only matter once it's on the market)
 2012-08-22 19:10:38 -07:00
Eric House
6758ebcdf5 version strings 2012-08-21 18:57:26 -07:00
Eric House
1423968098 check every day, not every seven, for users who've said they want the 
intermediate builds.
 2012-08-21 18:55:44 -07:00
Eric House
31ef5026be use constants for json params so easier to paste into python code 2012-08-21 07:43:49 -07:00
Eric House
ba43e54d8b make default false 2012-08-21 07:14:58 -07:00
Eric House
cc4549e7d3 add debug pref controlling whether non-release updates are installed. 
(passed to info.py, but is ignored there so far)
 2012-08-20 07:23:13 -07:00
Eric House
fca1621ad0 use json to do app and all dict queries in one transaction 2012-08-18 07:42:42 -07:00
Eric House
07c6d57233 pass git version and installer name (usually empty) as part of update 
for more granularity
 2012-08-16 21:49:52 -07:00
Eric House
fbe842d089 cleanup 2012-08-16 08:14:50 -07:00
Eric House
75d8820b98 make check-for-updates a debug-only menuitem 2012-08-16 07:48:34 -07:00
Eric House
5584a66043 run update checks off a timer that adds a random element to its 
interval; move update check URL into a debug pref.
 2012-08-16 07:43:57 -07:00
Eric House
6bdec885b1 add nextRandomInt() to Utils and use it 2012-08-16 07:26:51 -07:00
Eric House
6226efe8d6 move remaining non-jni prefs stuff from CommonPrefs to XWPrefs. No 
other changes.
 2012-08-16 06:31:23 -07:00
Eric House
81d7903aa3 move new version checking stuff into new file 2012-08-15 19:24:57 -07:00
Eric House
e749aedd34 return url inside a json rather than just a url for more flexibility 
and so python's error messages don't trigger Notifications that then
fail.
 2012-08-15 18:55:54 -07:00
Eric House
4b318070ca remove unused imports 2012-08-15 18:52:56 -07:00
Eric House
910bb2a5a0 add new function loge that takes an Exception and logs a stack trace 
for it
 2012-08-15 18:52:31 -07:00
Eric House
3666d5b541 Merge branch 'from_android_beta_49' into android_branch 2012-08-15 18:31:07 -07:00
Eric House
ca4b2e5354 update version code/strings 2012-08-15 18:18:59 -07:00
Eric House
6947c50238 pass lang instead of lang code; include app name in notification text 2012-08-15 07:22:10 -07:00
Eric House
cd340aba0c post notification on receipt of url for new app that'll result it it's 
being downloaded.
 2012-08-15 06:53:13 -07:00
Eric House
7cb68f1c85 post notification when new dict is available and download it in 
when notification selected.
 2012-08-15 06:10:39 -07:00
Eric House
8b6af3fdb9 add md5sum calculator for dicts and use to send POST that checks if 
they're current.
 2012-08-14 07:13:03 -07:00
Eric House
3ef81f248b start on checking for updates/latest version: a menu item that 
triggers new code that sends an HTTP POST to a python script on the
server that returns whether the current version is correct.
 2012-08-13 21:10:22 -07:00
Eric House
9128c2d60c factor code into new method copyFileStream 2012-08-13 07:45:14 -07:00
Eric House
829fd01685 remove change note about SMS version release 2012-08-13 07:09:59 -07:00
Eric House
ec0702d584 initialize buffer that common code will pass to strcat. 2012-08-10 21:31:01 -07:00
Eric House
c046606e53 string changes a new changes file toward new release and initial 
release of SMS version
 2012-08-02 07:18:58 -07:00
Eric House
27cbd0e0c9 go with end-game change that takes remaining tiles into account for 
robots but not for hints.
 2012-08-01 20:31:21 -07:00
Eric House
464696566d get rid of NODE_CAN_4. Not change to post-compiled code 2012-08-01 20:29:15 -07:00
Eric House
ade5a84e2d tweak sms plan confirmation text 2012-07-31 07:46:16 -07:00
Eric House
3641799c4e wrap sms confirm view in scroller as it's wordy enough to need it in 
landscape mode.
 2012-07-31 07:45:58 -07:00
Eric House
8562503cd9 show status icon as red when SMS game and airplane mode on. (Better 
would be to track radio state in NetStateCache.)
 2012-07-31 06:47:52 -07:00
Eric House
4414943f90 implement loading saved DB from /sdcard 2012-07-30 18:36:41 -07:00
Eric House
af2c361225 add debug menu option to enable debug features, and first such 
feature, to copy xwdb file to /sdcard.  Option to do opposite is
stubbed out.
 2012-07-30 07:23:52 -07:00
Eric House
1fe14be9bf less ominous text for new SMS game creation, ominousness having moved. 2012-07-30 07:14:52 -07:00
Eric House
730cd0d599 tweak dialog text 2012-07-26 21:16:00 -07:00
Eric House
e70fbda502 don't send packets if SMS play disabled 2012-07-26 07:21:16 -07:00
Eric House
1abba7e560 fix crash on first install: context !always= PrefsActivity 2012-07-26 07:20:39 -07:00
Eric House
9c670804f2 draw status icon background red when SMS turned off. 2012-07-25 23:26:24 -07:00
Eric House
bc91956e20 put up an alert when SMS game opened but SMS is disabled. (Does not 
have a button taking you to settings.)
 2012-07-25 07:15:57 -07:00
Eric House
6405294f2f remove unused pref 2012-07-25 07:12:54 -07:00
Eric House
cd1eb2e4da add pref enabling SMS games, and a scary confirmation dialog meant to 
force user to realize the potential costs (by requiring interaction).
Until that's enabled, show in New Game activity an explanation and
button that goes to Preferences.
 2012-07-24 07:15:27 -07:00
Eric House
4f437f0d55 don't start SMS receivers on device without a phone 2012-07-24 07:09:37 -07:00
Eric House
8e961fcb4c remove logging 2012-07-24 06:56:55 -07:00
Eric House
b7247d259c add superclass for CommonPrefs that can hold stuff not related to 
jni/common code.
 2012-07-23 22:42:38 -07:00
Eric House
381f30b6d2 claim to handle keyboard/orientation changes for prefs activity 2012-07-23 22:36:50 -07:00
Eric House
9df8086476 no SMS game option if device has no phone 2012-07-21 19:02:23 -07:00
Eric House
549c826c9a show SMS message send/receives from BoardActivity where a hander's 
available.
 2012-07-20 21:36:59 -07:00
Eric House
54b4478582 show orange arrows briefly when net traffic goes in or out 2012-07-20 18:11:02 -07:00
Eric House
00317dea1e center board and buttons so that any leftover white space is half 
above and half below.
 2012-07-20 17:01:58 -07:00
Eric House
2a25bae706 don't use cached bitmap if board's been resized 2012-07-19 06:54:56 -07:00
Eric House
95b68ffae2 up changelog and version strings for new release 2012-07-18 07:24:59 -07:00
Eric House
a5c3c7e548 fix layout on wider screens (e.g. 768x1024): rather than draw the 
board so wide that scrolling's required, reduce width enough that it's
not.
 2012-07-18 07:07:53 -07:00
Eric House
516a1800a0 Add board-size to game config. It makes no sense for it to exist in 
per-game defaults but not be settable in config.  But it may make more
sense to remove both options/locations entirely, or hide them by
default.
 2012-07-16 07:15:33 -07:00
Eric House
9b0436d1ee Make rem string measure function return boolean to indicate rect will 
be invisible rather than setting width and height to 0.  No real
change beyond simplifying/speeding platform code.
 2012-07-15 09:30:27 -07:00
Eric House
d602a0c22b fix reported NPE by saving variable in bundle passed to onCreate 2012-07-14 14:53:57 -07:00
Eric House
0769cbccdc capitalize consistently 2012-07-14 07:48:19 -07:00
Eric House
479ed0dc58 update conn status on receipt or send of packets to/from relay, not 
just when relay connect status changes.  This means that a game will
show as connected when it's still waiting for another device to join
room, but also fixes exchanging moves over 10 minutes and having the
status icon say you haven't sent or received in that long.  This could
be improved.
 2012-07-12 21:15:35 -07:00
Eric House
248db3d144 update version strings and changelog 2012-07-12 20:56:28 -07:00
Eric House
a3de089e15 remove unused constant 2012-07-12 06:34:54 -07:00
Eric House
abcdafe56a always invalidate board view to force layout/draw. Fixes crosshairs 
not going away, and board being unresponsive, after lookup activity is
dismissed.
 2012-07-12 06:34:01 -07:00
Eric House
d3b56f4167 don't show rem text when -1 2012-07-12 06:15:53 -07:00
Eric House
11bd4a73fe oops: fix centered text drawing. 2012-07-11 06:17:36 -07:00
Eric House
bad6c599f8 more tweaks to tray tile drawing: make small screen letters 3/4 height 
even though numbers are 1/3 and overlap is in theory possible; put 1/5
of extra space to left of letters so they don't hug the edge.
 2012-07-10 21:04:54 -07:00
Eric House
c2956f4064 save net status state on a timer (when handler is available) waiting 
five seconds.
 2012-07-10 06:21:49 -07:00
Eric House
bd70a1dd7d improve text in remaining tiles dialog, and always show the tiles for 
all trays rather than excluding those in current player's tray.
 2012-07-09 21:44:29 -07:00
Eric House
e6f02ee3c7 when drawing letter in tray tile, only shift origin left of edge when 
letter width exceeds that of tile.
 2012-07-09 07:03:39 -07:00
Eric House
5702c83f17 do string formatting properly, using resources and StringBuffer. 2012-07-09 06:56:08 -07:00
Eric House
e7b0727e0c leave remaining-tiles in place when pool count drops to 0. 2012-07-09 06:07:26 -07:00
Eric House
9885d3bf61 draw letters in tray tiles as far to left as possible 2012-07-07 19:55:19 -07:00
Eric House
7f087181e5 Don't store current network connType in ConnStatusHandler; instead 
pass the one for which we want icon displayed or status text
generated.
 2012-07-07 19:45:18 -07:00
Eric House
0c02103d42 fix assertion failures due to failure to get game locks. The problem 
is that getSummary() can be called at unpredictable times by
background tasks for the games list, and the current open game holds a
lock as long as it's open.  So those getSummary() calls must be
allowed to fail.  Before, letting them fail immediately meant
empty/unusable list elements; now I've added a time they'll wait
before failing.  Now the ones that are called while a game is open can
fail without being noticed, but the ones that are called as a game is
closed to update its summary will succeed by being able to wait for
its lock to be given up.
 2012-07-07 11:34:40 -07:00
Eric House
30c77de2d0 tweak menu name 2012-07-07 11:29:25 -07:00
Eric House
6abb56dd0c make tmp list elem closer in size to the real thing so screen jumps 
around less.
 2012-07-07 11:29:15 -07:00
Eric House
318cc52f5a we need the base64 stuff even when don't have SMS -- for serialization. 2012-07-07 11:05:45 -07:00
Eric House
052725aabc fix problems with serialization: use types that are serializable, and 
init transients correctly.
 2012-07-07 11:05:07 -07:00
Eric House
43fead368c make Random class static rather than generate one over and over 2012-07-07 09:27:27 -07:00
Eric House
3c19a7ef44 tolerate failure to get lock for five seconds before asserting (up 
from one.)
 2012-07-06 07:14:01 -07:00
Eric House
75602c47d8 on Amazon-made devices only, sleep randomly during load of game 
summary.  This seems to work around a bug where only the last item in
the list is clickable but once it's clicked events are received for
every failed click up to that point.
 2012-07-06 07:13:11 -07:00
Eric House
9a23473b2f use a dummy TextArea instead of an empty custom view as a placeholder 
for loading game summary view.
 2012-07-06 06:49:09 -07:00
Eric House
d6fdd24637 move interface methods together -- no code change 2012-07-06 06:10:04 -07:00
Eric House
1ad0a899f0 don't return from getSummary without succeeding, even if must wait on 
lock.  Fixes problem with blank entries in game list after returning
from config screen.
 2012-07-03 20:30:31 -07:00
Eric House
60a799ef1f move SMS games up again, this time in a way that networked game creation 
isn't hidden along with SMS.
 2012-07-03 07:02:29 -07:00
Eric House
bf9fe75f5c Revert "in new game dialog, move sms above network (since that's presumably" 
This reverts commit 19dbddc0b8.
 2012-07-03 06:37:24 -07:00
Eric House
eba1d91157 fix game_config view contents sticking to bottom of tall screen when lock 
checkbox hidden, e.g. on Kindle Fire.
 2012-07-03 06:29:59 -07:00
Eric House
be9ed5b963 add toolbar button style for 'large' devices so buttons are bigger on 
the Kindle Fire but not too big on phones.
 2012-07-02 07:39:06 -07:00
Eric House
8ebe180eab fix NPE 2012-07-02 06:59:35 -07:00
Eric House
19dbddc0b8 in new game dialog, move sms above network (since that's presumably 
the reason people chose that version)
 2012-07-01 17:35:50 -07:00
Eric House
2e6b64a4e4 complete implementation of java part of one-pass scoreboard draw. Now 
looks pretty much identical to what the old code draws except that
rather than having width allocated in proportion to requested size all
get the same width except the one whose score it is which gets 2x.
 2012-07-01 17:24:50 -07:00
Eric House
c41c877ae7 fix right edge of scaled text getting clipped by paying attention to 
where getTextBounds() says its left edge is.
 2012-07-01 17:05:39 -07:00
Eric House
2434d85684 don't pass the same player-1 data for every player 2012-07-01 16:01:01 -07:00
Eric House
5cd8ab2b33 remove uncalled method -- no change. 2012-07-01 15:57:20 -07:00
Eric House
2ae6bd8caf override onMeasure to make BoardView only as large as it needs to be 
so that on tall narrow screens (e.g. Kindle Fire) there's no white
space between the tray and the buttons.
 2012-07-01 12:54:38 -07:00
Eric House
89ffd972bf more work on single-pass scoreboard drawing. Now the jni stuff is 
finished, but disabled via compile-time flag, and there's a
commented-out rudimentary implementation on the java side.
 2012-07-01 10:04:10 -07:00
Eric House
b9b58bd0a5 enable tray tap undo 2012-06-29 06:52:49 -07:00
Eric House
69b0a0d4a3 load conn state for sms app too 2012-06-28 07:22:10 -07:00
Eric House
9b9aec45da format status timestamps in terms of how long ago (using 
getRelativeDateTimeString); save and restore serialized timestamps.
 2012-06-28 07:20:28 -07:00
Eric House
52e70bff3d rename method; make [g|s]etPrefsString public 2012-06-28 07:17:48 -07:00
Eric House
c8e2dff962 start process of compiling with XWFEATURE_SCOREONEPASS enabled by 
adding stubbed-out methods and making old methods conditionally
compiled.  No change in code.
 2012-06-27 07:08:09 -07:00
Eric House
065446def4 paint status area background manually in red or green and use a single 
transparent background icon for success and failure.
 2012-06-27 06:44:24 -07:00
Eric House
13633186ff don't reset variable unless changed 2012-06-26 06:50:54 -07:00
Eric House
8ff27cc075 include "sms" or "text" in chooser title 2012-06-24 14:46:02 -07:00
Eric House
5eb937dede use deviceSupportsSMS() to skip asking user whether to invite vis SMS 
or email when SMS isn't an option.  Assumption: email *is* available,
which it isn't if it hasn't been configured yet.
 2012-06-24 14:43:57 -07:00
Eric House
392f4239d7 add deviceSupportsSMS() -- which checks phonetype, i.e. that there's no phone. 2012-06-24 14:42:46 -07:00
Eric House
7dfe5ba8e1 inval status icon when there's a change so it gets updated. 2012-06-21 18:28:45 -07:00
Eric House
10b47257e9 flesh out new connection status icon: track times and give meaningful 
message.  Still to do: [de]serialize state, and separate global from
per-game somehow.  Might also want to include game state (e.g. whether
in a game or still looking.)
 2012-06-20 07:50:08 -07:00
Eric House
2b9fb13dbd Merge branch 'android_smallscreen' into android_branch 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
 2012-06-20 06:14:37 -07:00
Eric House
c2c1fe4f89 attempt to improve scoreboard drawing when names are long or numerous 
enough to crowd by using same math to figure height when measuring as
when drawing, but it still needs work.
 2012-06-19 07:44:26 -07:00
Eric House
df907f6cb3 up version strings and changelog 2012-06-19 07:36:32 -07:00
Eric House
964c4cecd8 add dict-browse menuitem to small-screen board menu and on same move 
undo/redo up per user request
 2012-06-19 06:19:03 -07:00
Eric House
bb5cd677ab make turn color public so can be used from board too (though I'm not 
doing that yet.)
 2012-06-19 06:19:03 -07:00
Eric House
9d8e1ec261 cleanup: one-letter variables are bad. 2012-06-19 06:19:03 -07:00
Eric House
c34f70f9eb fix bug where current player's scoreboard would disappear if other 
players' names were too long by giving all a the same proportion of
what they request and passing in the percent given in case draw
implementation wants to use it as a cue to truncate.
 2012-06-19 06:19:03 -07:00
Eric House
4cd8f8bfd1 change toast to not imply game to start immediately. 2012-06-19 06:18:44 -07:00
Eric House
545cf9166f show green border in contracted view too when appropriate, and not 
only for net games.
 2012-06-19 06:18:16 -07:00
Eric House
d46c827b4c reduce min tray height to twice cell height, and tweak layout on 
small-screen devices to make the value readable.
 2012-06-19 06:16:36 -07:00
Eric House
2e2df3dc17 add hasSmallScreen() 2012-06-19 06:11:16 -07:00
Eric House
a65e1dfa79 add menus for small-screen devices to provide functionality others get 
from toolbar.
 2012-06-19 06:11:16 -07:00
Eric House
5d9381e1bc change text of menu from hide rack to show rack depending on hidden state 2012-06-19 06:11:16 -07:00
Eric House
78dfd6267c include trayVisState in GameStateInfo on the java side 2012-06-19 06:11:16 -07:00
Eric House
b78ea03ea6 add board layout for small case that doesn't include toolbar or 
exchange-state buttons, and check for presence of Views that may now
be missing.  With this checkin small screen devices don't have access
to toolbar functionality -- new and expanded menu will be required for
them.
 2012-06-19 06:11:16 -07:00
Eric House
1e9928e7f3 add commented-out toString() for debugging 2012-06-19 06:11:16 -07:00
Eric House
d7f576d6b7 fix board dimensioning for small (needs-scrolling) screens. Since this 
effects larger screens needs some testing.
 2012-06-19 06:11:16 -07:00
Eric House
9ac5113c93 add dict-browse menuitem to small-screen board menu and on same move 
undo/redo up per user request
 2012-06-15 07:00:18 -07:00
Eric House
628c058c4c make turn color public so can be used from board too (though I'm not 
doing that yet.)
 2012-06-15 06:44:39 -07:00
Eric House
6beb572180 cleanup: one-letter variables are bad. 2012-06-15 06:43:54 -07:00
Eric House
405cb23023 fix bug where current player's scoreboard would disappear if other 
players' names were too long by giving all a the same proportion of
what they request and passing in the percent given in case draw
implementation wants to use it as a cue to truncate.
 2012-06-15 06:26:40 -07:00
Eric House
3d9478744a change toast to not imply game to start immediately. 2012-06-13 20:07:28 -07:00
Eric House
46770ac0cb show green border in contracted view too when appropriate, and not 
only for net games.
 2012-06-12 07:19:18 -07:00
Eric House
e3401724e1 new icons for network status and code to draw them, so far hard-coded 
to show success.
 2012-06-11 19:23:01 -07:00
Eric House
266e9ba91a reduce min tray height to twice cell height, and tweak layout on 
small-screen devices to make the value readable.
 2012-06-11 07:01:36 -07:00
Eric House
ac74e2e832 add new class that will be responsible for drawing network status icon 
at right end of scoreboard.  It now shows the same icon as the games
list per connection type and gives a stubbed-out status message dialog
when tapped.  Still need to add actual status: when was the last
successful send or receive; and need to add decorations to show
connection state.
 2012-06-10 07:40:33 -07:00
Eric House
4fc33fe4e5 add hasSmallScreen() 2012-06-09 10:01:41 -07:00
Eric House
9827ea1b39 add menus for small-screen devices to provide functionality others get 
from toolbar.
 2012-06-06 06:48:55 -07:00
Eric House
b8bad58125 change text of menu from hide rack to show rack depending on hidden state 2012-06-05 22:19:44 -07:00
Eric House
6257c14436 include trayVisState in GameStateInfo on the java side 2012-06-05 22:13:58 -07:00
Eric House
e15c104eb4 add board layout for small case that doesn't include toolbar or 
exchange-state buttons, and check for presence of Views that may now
be missing.  With this checkin small screen devices don't have access
to toolbar functionality -- new and expanded menu will be required for
them.
 2012-06-05 07:42:39 -07:00
Eric House
c5358dc9c3 add commented-out toString() for debugging 2012-06-05 07:41:00 -07:00
Eric House
b3cf9c65aa fix board dimensioning for small (needs-scrolling) screens. Since this 
effects larger screens needs some testing.
 2012-06-05 07:38:58 -07:00
Eric House
a38c275663 back to building for android-7 2012-05-30 21:23:53 -07:00
Eric House
27ddc355ed don't bother cloning message when it'll be passed to multiple games. 
Clone was too late, and there's no chance of modification of the
contents.
 2012-05-30 06:54:30 -07:00
Eric House
a03dc80205 tweak method for clarity -- no behavior change 2012-05-30 06:52:08 -07:00
Eric House
a0336ebb01 turn on new HASH_STREAM feature 2012-05-29 07:26:51 -07:00
Eric House
65f90b2d86 up version number and add changes 2012-05-29 07:26:24 -07:00
Eric House
0b1a9a67fe add param to server_handleUndo to prevent it from undoing all moves in 
robot-vs-robot game, which is the wrong thing to do during a test
simulating play.
 2012-05-24 22:25:30 -07:00
Eric House
2db02f9aa5 fix delegated dialogs to clear state before issuing dismiss callback 
so that callback can set up another dialog without tripping an assert,
then move SMS invite dialog chaining from on-click callback to
on-dismiss.
 2012-05-23 07:16:27 -07:00
Eric House
622afa4d98 track what games we've sent died notices for and don't repeat. Fixes 
infinite message flood occurring when a packet was received after
games had been deleted on both devices.
 2012-05-21 21:47:09 -07:00
Eric House
e80417e806 don't draw separate icon in games list elements for needs-sync relay 
game -- since that state no longer really exists.
 2012-05-21 21:23:13 -07:00
Eric House
adac3abcc6 fix bug where all notifications wound up launching the same game 
because all their PendingIntents were the same by passing a unique
resultCode on creation.
 2012-05-21 06:46:37 -07:00
Eric House
f56b09980c include game name in notification text 2012-05-21 06:40:52 -07:00
Eric House
469f63f96f log when more than one game found with a given ID. 2012-05-20 10:33:26 -07:00
Eric House
1ca36044a0 allow for possibility that there's more than one game on device with 
one gameID.  Currently this should only happen when a device is
playing via SMS against itself -- i.e. when I'm debugging or a user is
playing around.  It hasn't been tested and may not work to the extent
that a game like that can actually work and so may want to be backed
out later.
 2012-05-20 10:24:37 -07:00
Eric House
3c4e01ef52 improve text clarity 2012-05-18 21:23:38 -07:00
Eric House
211318f2ef remove logging 2012-05-18 21:23:09 -07:00
Eric House
df0c5e4abf move plus button to middle, and fix so both text buttons wrap when 
required on narrow screen.
 2012-05-18 21:14:50 -07:00
Eric House
47a5ab65df use broadcast receiver for status PendingIntents from SendTextMessage, 
and pass up new MultiService messages on success or failure.  In
response to these, post SMS status icons on board.  Still need to come
up with an initial status, notice radio ups/downs, etc.  And design icons!
 2012-05-18 07:55:10 -07:00
Eric House
523d49ef04 stubs for sms status icons 2012-05-18 07:52:32 -07:00
Eric House
9ba663ab98 implement util_phoneNumbersSame in java and call telephony's number 
compare method.  Skip the java call when the numbers are
strcmp-identical.
 2012-05-18 07:41:46 -07:00
Eric House
867e9ffc2f implement stubbed-out util_phoneNumbersSame so that three-device SMS 
games work in emulator.  May need to call into java to use Android's
more sophisticated phone number comparison to work on devices.
 2012-05-18 07:17:21 -07:00
Eric House
60c3a5bf64 use green_border to frame remote players whose turn it is. 2012-05-18 06:54:05 -07:00
Eric House
40843db7df rename 9-patch 2012-05-18 06:52:25 -07:00
Eric House
599d0630d3 built main app for same version as sms version 2012-05-18 06:22:23 -07:00
Eric House
81f830c0d4 drawable that creates a green frame around view -- to show it's remote 
player's turn.
 2012-05-18 06:22:06 -07:00
Eric House
3a54aa0ebc add util_informUndo() that gets called, and puts up a dialog, after 
remote device has performed an undo on a committed turn.
 2012-05-14 07:01:02 -07:00
Eric House
10ad59247a don't remove undo menuitem for networked games -- should be safe to 
use now.
 2012-05-11 07:26:49 -07:00
Eric House
a311e487a9 add another change 2012-05-09 18:22:30 -07:00
Eric House
013d9c689b fix bug introduced with dictionary lookup of words played that meant 
trades didn't get reported as remote moves -- it just became your turn
without notice.
 2012-05-09 18:22:05 -07:00
Eric House
261908a09f use non-strippable spaces when ': ' is meant to terminate string. 2012-05-09 18:19:53 -07:00
Eric House
f6ba94735d move BT and SMS listener installation behind if_supported tests 2012-05-09 07:09:15 -07:00
Eric House
1c08190941 list the other change 2012-05-09 06:51:48 -07:00
Eric House
d846f96ec5 post-code-review cleanup: no significant change 2012-05-09 06:51:06 -07:00
Eric House
e797b342fe check in sms version of prefs xml file so that it can have its 
checkbox for turning off warnings about SMS costs.  I've already
wasted too much time without figuring out how to add or remove the
pref programatically....
 2012-05-07 21:09:01 -07:00
Eric House
e82faedc63 up version number here too. 2012-05-07 07:13:48 -07:00
Eric House
c17826ffbf up beta version 2012-05-05 17:39:30 -07:00
Eric House
fd4ad0ae31 turn on board hashing and bigboard options (in protocol, not UI) 2012-05-04 06:16:02 -07:00
Eric House
75247e59df fix confusing log message 2012-04-26 19:12:13 -07:00
Eric House
49f4700799 change sms-game-name dialog title 2012-04-24 19:01:21 -07:00
Eric House
b68b8aa0d0 for extra safety, move message hash into header where it can be part 
of test whether message should be deleteted from sms inbox.
 2012-04-24 07:19:52 -07:00
Eric House
9035f901b1 fix NPE for non-SMS case 2012-04-23 21:46:27 -07:00
Eric House
6930da9686 add warning about unlimited SMS plans that's triggered whenever a new 
number is added to the list of possible invitees.
 2012-04-23 20:07:44 -07:00
Eric House
010fae495b fix compile error 2012-04-23 07:37:02 -07:00
Eric House
2082b40d4a look up names from phones rather than store them separately 2012-04-23 07:32:42 -07:00
Eric House
f7c9e0cc16 use name in summary where available 2012-04-23 07:31:33 -07:00
Eric House
b2a1fefd26 synchronize access to phone-to-name hash 2012-04-23 06:55:00 -07:00
Eric House
07c1d68321 syntax error! 2012-04-23 06:54:23 -07:00
Eric House
97cb3863a6 name constant -- no code change 2012-04-23 06:34:00 -07:00
Eric House
02443d26a9 catch oob exception when older version receives enum not in values() array 2012-04-23 06:30:20 -07:00
Eric House
b34e741e30 add param to phoneToContact controlling whether phone number is 
returned when name can't be found.
 2012-04-23 06:16:06 -07:00
Eric House
d5076e2167 make a couple of methods private 2012-04-23 06:14:02 -07:00
Eric House
a98f9ef12f refactor; don't rely on otherwise unused i-var. 2012-04-23 06:13:05 -07:00
Eric House
a72dbdd8dd add static to cache phone->name mapping 2012-04-21 22:16:47 -07:00
Eric House
3af20f1d5a look up name for phone number in contacts and use in game config. 
Will want to use elsewhere.  May want to cache depending on speed.
 2012-04-19 00:37:37 -07:00
Eric House
e5758766f7 test for null comment 2012-04-19 00:36:51 -07:00
Eric House
fd18d8c95a add boolean param to jni version of comms_resendAll() to ack 
afterwards.  Saves some extra jni calls.  Then make comms_ackAny()
separately-useable, and use from BoardActivity after receiving
SMS messages.
 2012-04-19 00:03:22 -07:00
Eric House
033a69be8d to make it easier to tell games apart, print the number[s] of the 
remote device[s] as part of summary view and in game config screen
(read-only).  Use same field in summaries table for remote phone
numbers and bt addresses.
 2012-04-18 23:23:36 -07:00
Eric House
d6ad17ad58 don't crash if relayID null 2012-04-18 23:07:14 -07:00
Eric House
8713b9e148 don't crash when relayID is null 2012-04-18 23:05:28 -07:00
Eric House
b4416f3abe add missing private keyword 2012-04-18 23:04:55 -07:00
Eric House
d67614cd69 send ack after creating game on receipt of SMS invitation. Thought 
about starting up the game so it could connect, but that'd make it
impossible to change any settings, e.g. player name, on the accepting
end.
 2012-04-17 21:46:57 -07:00
Eric House
019a053df0 give move-made notifications ids based on the games they belong to so 
that there can be more than one, then use those ids to dismiss them if
the game's opened other than through the notifications.
 2012-04-17 20:08:37 -07:00
Eric House
3d60ee701e honor setting for toast showing messages sent and received 2012-04-17 19:23:15 -07:00
Eric House
1134f71b7b use new comms_ackAny() call to send ACKs at points where currently 
resendAll is being called.  Dramatically reduces SMS message count
when app is being relaunched and backgrounded between turns.
 2012-04-14 18:00:43 -07:00
Eric House
0e4abccc41 clean up, and try to keep contacts checked while the count available 
is not in excess of the number needed.  Makes it easier to use early
on.
 2012-04-12 23:24:13 -07:00
Eric House
6ea692d430 use showConfirmThen() for non-mobile numbers 2012-04-12 23:04:08 -07:00
Eric House
8a4452ea53 add another variant of showConfirmThen() 2012-04-12 22:56:40 -07:00
Eric House
e2be770ca9 if the number of phone numbers sought matches the number available 
check them all; confirm delete (since the button's enabled now from
the beginning.)
 2012-04-12 22:38:42 -07:00
Eric House
5949994557 cleanup -- remove logging and simplify code a bit. 2012-04-12 21:24:52 -07:00
Eric House
5b5b969e71 Merge branch 'android_branch' into android_bt 2012-04-12 20:59:47 -07:00
Eric House
4ffdeefe3b add dumpCursor 2012-04-12 20:59:29 -07:00
Eric House
e1c977323a on first boot, run through SMS database in case there are any messages 
there that came in before we were installed.  Pass any found in as if
newly received (but don't delete.)
 2012-04-12 20:57:52 -07:00
Eric House
459ddf6e96 Merge branch 'android_branch' into android_bt 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
 2012-04-12 18:05:58 -07:00
Eric House
5efe959584 move test for whether this is first boot on new version into Utils, 
and add test for whether it's new boot ever (to be used with sms on
another branch.)
 2012-04-12 18:04:21 -07:00
Eric House
31659bc514 improvements to smsinviter dialog: add explanatory empty text, dialog 
that warns when non-mobile number being added, always check
newly-added number, etc.
 2012-04-11 18:54:38 -07:00
Eric House
0c241cf207 fix crash in sms message sink when address null -- same as bt message sink. 2012-04-10 21:47:15 -07:00
Eric House
522fd29b44 fix to show/return individual phone numbers. Still todo: warn rather 
than drop numbers not flagged as mobile.
 2012-04-10 19:25:22 -07:00
Eric House
e703685021 add new pref controlling whether networked games have hints enabled by 
default.
 2012-04-10 07:53:39 -07:00
Eric House
90bca47e1b query and send name with SMS invite -- same as for BT. 2012-04-10 07:26:56 -07:00
Eric House
f841b8ccce use different SMS-headers for different variants so they can coexist 
and not poach each others' conversations.
 2012-04-10 06:49:43 -07:00
Eric House
e6c8c898fc hide '+' button when no number text entered 2012-04-10 06:36:34 -07:00
Eric House
b98be90869 tweak sms-inviter button text for greater clarity 2012-04-10 06:36:17 -07:00
Eric House
d72cd547b7 fix bug where new game gets data from just deleted: clear cache! 2012-04-08 21:35:50 -07:00
Eric House
d6a3aafaec factor upward code from BTEvent so that SMSService can use same 
mechanism to send asynchronous results, then use to notify when a game
on other end has been deleted.  This flushed out a bug where a rowid
will get reused and a new game wind up with data from the previous
one -- but otherwise works.
 2012-04-06 23:00:47 -07:00
Eric House
d9ba0c4229 display phones sorted by contact name. 2012-04-05 18:35:29 -07:00
Eric House
523af50d1b use a single custom class rather than three parallel arrays. 2012-04-05 18:22:08 -07:00
Eric House
2a121b1635 get rid of debug formatting 2012-04-05 07:50:40 -07:00