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

4376 commits

Author SHA1 Message Date
Eric House
f983e477a2 remove all code for sending and receiving non-data SMS. The plan is 
that SMS will only be supported for GSM phones from here out (unless
Google figure out how to make the Data SMS APIs work on CDMA devices.)
 2015-01-25 13:56:33 -08:00
Eric House
1ec5df0914 fix so button is correctly enabled from the start 2015-01-24 21:55:44 -08:00
Eric House
9806b01d6b get rid of send-invitation menuitem, since it's never there unless 
there's a dialog in front of the board forcing you to send an
invitation.
 2015-01-24 16:32:11 -08:00
Eric House
b8ff064819 turn another set of constants into an enum: no code change 2015-01-24 16:20:13 -08:00
Eric House
bd55ed025e fix handling bt invitations when the wordlist specified is missing 2015-01-24 15:59:36 -08:00
Eric House
9031885eb0 fix duplicate NFC invites being accepted (but not working to create 
usable games) by fixing broken query used by getMostRecentCreate()
 2015-01-24 14:59:15 -08:00
Eric House
56e61061be add alert explaining "just tap" when user picks nfc for sending invite 2015-01-24 14:29:49 -08:00
Eric House
dd6aa95068 force invite alert to stay up as long as a host has players missing. 2015-01-24 14:18:30 -08:00
Eric House
445d44e773 import child class to cut a few characters from file -- no code change 2015-01-24 13:48:03 -08:00
Eric House
da374db1bc fix progress alert thinging being left after BT invites accepted in 
case where more than one device being invited. Really should
incorporate progress into the dialog showing missing players, but this
is better than before.
 2015-01-24 13:22:51 -08:00
Eric House
f87dd30bd6 don't create new using-defaults game is if from a received invitation 2015-01-24 13:07:52 -08:00
Eric House
17f4e35bf4 tweak wording 2015-01-24 12:57:42 -08:00
Eric House
b2781afeb3 offer to hide newgame buttons via augmented showNotAgainDlgThen shown 
when player has five or more games in list.
 2015-01-24 12:47:22 -08:00
Eric House
3a1e091852 fix crash on receiving end: inviteID is optional 2015-01-24 11:26:48 -08:00
Eric House
95f761d664 cleanup for better logging, including replacing constants with an enum 2015-01-24 11:01:50 -08:00
Eric House
027cd319e6 Merge branch 'android_branch' into android_multi2 
Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-01-24 10:10:10 -08:00
Eric House
7b2a6fddf8 add an assert toward figuring out google-reported assert 2015-01-24 09:48:11 -08:00
Eric House
44624b20d9 up strings and changes list for release 2015-01-24 08:59:44 -08:00
Eric House
9b0eba8be6 up copyright for the new year 2015-01-24 08:54:06 -08:00
Eric House
f48d79d4c8 provide default default language name (and rename string constant 
being used that way now too)

Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-01-23 08:35:04 -08:00
Eric House
e0c9d626ae rename script 2015-01-23 08:30:19 -08:00
Eric House
178156b7d7 Add UI to invite via SMS more than one player per device (if the 
"Advanced" option is enabled).
 2015-01-23 08:19:20 -08:00
Eric House
bfd6b2162d swap two config positions 2015-01-22 07:39:07 -08:00
Eric House
aec70782f4 tweaks to get game initialization working, including not looking on 
startup for incoming text messages if on KITKAT or above.
 2015-01-22 07:37:06 -08:00
Eric House
c3482925b4 Send NLI data for invitation instead of field-by-field. Try to prevent 
duplicate phone number entries when the same number is formatted
differently.
 2015-01-20 07:57:08 -08:00
Eric House
4b345ff28e new methods to store and retrieve byte arrays 2015-01-20 07:52:49 -08:00
Eric House
f8e530da9b Snapshot toward making SMS work again: invites now work via 
user-visible SMS, providing a URL same as email that launches the app
with a new game. Game works sending via NBS (data SMS) when both
devices are on GSM (T-mobile, anyway.) Plan is to use os version and
gsm info included in invite to warn user when the game can't
communicate, but that test isn't done yet. Also removed debug pref
allowing to force send by NBS.
 2015-01-18 10:49:15 -08:00
Eric House
f05d8c774e include class name in log 2015-01-17 22:11:20 -08:00
Eric House
71839b1e85 add READ_PHONE_STATE permission so I can send my phone number in invitatiosn 2015-01-17 22:00:43 -08:00
Eric House
182b651d21 remove unused import 2015-01-17 14:54:37 -08:00
Eric House
1da2ba7220 move commas -- no code change 2015-01-17 08:52:24 -08:00
Eric House
5f657bdfc4 add new change-connect-via button to set disabled when game in play 2015-01-17 08:13:54 -08:00
Eric House
e5ac525087 provide default default language name (and rename string constant 
being used that way now too)
 2015-01-16 21:28:59 -08:00
Eric House
004cd350fc fix uri encoding/decoding so that invite-by-email works 2015-01-16 21:07:55 -08:00
Eric House
31b524e6c0 include forceChannel in emailed invitations 2015-01-15 07:03:35 -08:00
Eric House
306c9ef4b6 hide relay-related stuff when relay communication not enabled; remove 
sms status stuff altogether.
 2015-01-13 21:59:54 -08:00
Eric House
d035396371 string tweak 2015-01-13 21:51:36 -08:00
Eric House
d1c300d752 string tweak 2015-01-13 21:51:27 -08:00
Eric House
af7335c729 refactor 2015-01-13 21:38:27 -08:00
Eric House
7e28d2004b add button to game config activity for changing the connection types to be used in that game 2015-01-13 21:27:51 -08:00
Eric House
2073098a5e fix crash: adding wrong item to list 2015-01-13 19:53:02 -08:00
Eric House
1139b1d5d1 put some space before all but the first heading 2015-01-13 19:42:19 -08:00
Eric House
ea62b90f61 show conn status based on most recently successful connType 2015-01-12 08:00:20 -08:00
Eric House
fc9c262796 catch exception whose cause I'm not sure of but that make it 
impossible to launch the app when a game gets into a certain
state. Probably need to catch exceptions at a top level of game
listing process and offer to discard those in which non-recoverable
exceptions occur. Later...
 2015-01-12 07:27:24 -08:00
Eric House
5c00e31d95 BT sends fail all the time, e.g. when BT isn't enabled on 
remote. Until I figure out how to not try BT after some point, don't
log exceptions.
 2015-01-12 07:24:39 -08:00
Eric House
a49e732371 remove logging 2015-01-12 06:26:03 -08:00
Eric House
2fa0ea3375 fix new game alert titles to differ depending on type being created 2015-01-12 06:25:28 -08:00
Eric House
0caf30c4e7 fix forceChannel for NFC invite 2015-01-07 06:53:36 -08:00
Eric House
688b3944bb fixes to invite: don't allow non-servers to invite; have common code 
inform of number of missing even when it hasn't dropped to 0 (so
second invite can be sent for 3+ device games); take down older alerts
before posting new (again since number of missing may have changed)
 2015-01-05 07:43:45 -08:00
Eric House
50f29383f5 tweak invite message to not require all invitations to be sent at once 2015-01-05 07:41:31 -08:00
Eric House
e394bf01e8 add assertion 2015-01-05 07:40:01 -08:00
Eric House
6da1b54636 add preference controlling whether more than on player is invited per 
remote device
 2015-01-05 06:32:16 -08:00
Eric House
05aaffb933 cleanup 2015-01-05 06:31:46 -08:00
Eric House
af6f01fd9c tweak drawing and size of status icon background 2015-01-03 22:18:30 -08:00
Eric House
f39b5e8e82 separate heads in new game icon too 2015-01-03 17:22:57 -08:00
Eric House
327b20a9fe add white space between the heads 2015-01-03 17:20:31 -08:00
Eric House
ddd1efd8dd modify new game actionbar icons to derive from game status icons 2015-01-03 16:44:13 -08:00
Eric House
641d83ab48 use new game type icons 2015-01-03 15:17:12 -08:00
Eric House
d1d6a2669b snapshots of icons 2015-01-03 14:57:19 -08:00
Eric House
6f64ff062e one shot at new one-device game icon 2015-01-03 10:33:32 -08:00
Eric House
4701fe2b90 pass in number of devices already connected so forceChannel can be set 
more correctly; put up alert when device rejects an invitation as a
duplicate.
 2015-01-03 09:50:07 -08:00
Eric House
9e67106adc fix crash by always initializing 2015-01-03 09:49:10 -08:00
Eric House
a7cc96c697 add ability to invite more than one player per device. This is mostly 
for testing and needs to be hidden by an "advanced" pref so folks
don't stumble onto it. Works for BT (SMS will crash), but needs
cleaning up.
 2014-12-31 06:54:31 -08:00
Eric House
d46c7a39f1 pass forceChannel as part of invitation 2014-12-30 07:25:26 -08:00
Eric House
28bfa3c904 make forceChannel part of CurGameInfo rather than comms, since Android 
needs to save it there on receipt of an invitation (doesn't create
full game with comms until later.)  Passes discon2 tests and seems to
work on a single Android device. (Haven't tested inviting on Android
yet.)
 2014-12-29 07:39:28 -08:00
Eric House
e8bb624b0b add preference checkbox for hiding newgame buttons (which are 
duplicated by menu items)
 2014-12-29 07:02:56 -08:00
Eric House
e961756f12 give up on hard-coding size of thread->env map: expand it as needed. 2014-12-08 20:43:24 -08:00
Eric House
c8e55a85a3 use a constant; log a bit more for now 2014-12-02 06:08:58 -08:00
Eric House
a1b967033f summarize role based on relay if in use, bt or sms otherwise 2014-12-02 06:08:18 -08:00
Eric House
73851b285e fix a couple of NPEs 2014-12-01 07:01:10 -08:00
Eric House
fe76cfa1a1 remove logging 2014-11-26 07:21:27 -08:00
Eric House
9bdf9b2f5e pass conType into java world from jni send proc, eliminating loops 
e.g. sending relay setup traffic over BT.
 2014-11-26 07:18:29 -08:00
Eric House
eac026a1a1 remove unused string 2014-11-25 07:18:16 -08:00
Eric House
0250f42b36 remove dead invite code 2014-11-25 07:17:52 -08:00
Eric House
8974407a67 setTitle: it's either networked or not 2014-11-25 07:17:03 -08:00
Eric House
2df8c68e60 remove commented-out logging 2014-11-25 07:16:43 -08:00
Eric House
938756a34f switch for loop to using C99-style variable declarations; no other change 2014-11-25 06:09:18 -08:00
Eric House
363215841d add assert 2014-11-24 07:50:54 -08:00
Eric House
963b0e23cf don't send bt pings on non-bt addresses 2014-11-21 23:00:16 -08:00
Eric House
80229376e9 include connection types string in header text 2014-11-21 08:02:55 -08:00
Eric House
38e37bfbb9 use gameID as inviteID when it's not provided. Originally it was a 
relay-only thing, but it's associated with being not-standalone in
places and this seems like the easiest fix.
 2014-11-21 08:02:18 -08:00
Eric House
67d41f34a3 remove loggin 2014-11-21 07:58:17 -08:00
Eric House
6c917f34ba fix race-condition assert by dropping message. This needs a better fix. 2014-11-21 07:57:58 -08:00
Eric House
c3ca257a10 oops: new style 2014-11-20 19:13:15 -08:00
Eric House
d08a7f8d24 use a style for new game buttons 2014-11-20 19:12:56 -08:00
Eric House
8d021aa11e trying to hide the buttons when they take too much space. Leaving 
commented out for now
 2014-11-20 19:11:22 -08:00
Eric House
301ce8bc3c spelling error in comment :-) 2014-11-20 18:57:57 -08:00
Eric House
fbea67e479 don't kill relay when bluetooth turned off: pass comms type into 
comms_transportFailed()
 2014-11-20 07:12:25 -08:00
Eric House
d3d83b3557 cleanup 2014-11-20 06:21:22 -08:00
Eric House
a35527ae88 need to copy in BT address too 2014-11-20 06:21:14 -08:00
Eric House
e236a32c20 forgot a mutex 2014-11-20 06:04:11 -08:00
Eric House
56121fdcd4 stop (or at least greatly reduce) leakage of thread->env mappings in 
jni, mostly by having jnithread explicitly announce that it's closing.
Yuck. This stuff *should* obey a stacking protocol but the callback
stuff I'm doing makes me unsure that can work.
 2014-11-19 21:42:21 -08:00
Eric House
a1bbbe3371 separate the new-game icons into two (as stubs) 2014-11-19 19:26:08 -08:00
Eric House
ae81404215 remove assert that was firing 2014-11-19 19:25:42 -08:00
Eric House
7977c8f799 cleanup 2014-11-19 19:19:12 -08:00
Eric House
1962371fe2 flesh out MultiMsgSink so that subclasses invoked e.g. in response to 
BT traffic can send messages via other means as well.  Relay games
with both participants on one device work again.
 2014-11-19 18:46:35 -08:00
Eric House
f14a1c095f print all conn types, not just the first 2014-11-17 07:06:56 -08:00
Eric House
11f7083eb6 remove dead classes and layouts; add menu to create networked games. 2014-11-15 20:42:09 -08:00
Eric House
64276b041e echo so I know it's doing something 2014-11-15 20:37:22 -08:00
Eric House
2465017e46 add buttons that create new games, bypassing the NewGame activity for 
a simpler experience.
 2014-11-15 17:59:59 -08:00
Eric House
d848c17d03 use real strings rather than enum's toString() result in prefs UI 2014-11-14 07:53:12 -08:00
Eric House
e750811836 add relay and bt as default address types when there's no preference set 2014-11-14 07:32:27 -08:00
Eric House
76fe26a057 include the list of currently selected conn types as pref summary 2014-11-14 07:24:24 -08:00
Eric House
2e8f4097d9 remove unused widget 2014-11-14 07:23:54 -08:00
Eric House
15e380291b snapshot: invite by BT now works well enough that moves can be 
exchanged. Haven't checked whether the relay's also seeing traffic.
 2014-11-14 07:12:03 -08:00
Eric House
f625332782 add preference (dialog) to set default address types. Not used yet, 
and still ugly.
 2014-11-13 07:27:29 -08:00
Eric House
3024bcbd50 get rid of bt and sms new game options 2014-10-27 19:12:38 -07:00
Eric House
93f0b626af snapshot: invite sent by NFC connects two devices using relay with BT 
ability passed too (though not yet used.)
 2014-10-27 07:51:25 -07:00
Eric House
7a1cd06486 fix crash in dict iteration: add to thread map the env that creates globals 2014-10-23 07:44:41 -07:00
Eric House
c3e7b12103 merge android_branch 2014-10-23 06:33:28 -07:00
Eric House
51a1ddfe39 include robot name in report of his score 2014-10-23 06:32:24 -07:00
Eric House
8486bad44b add default robot name to prefs 2014-10-23 06:21:16 -07:00
Eric House
3fe3b1724a replace stacked tracking of env with explicit mapping from pthread to 
env for that thread to fix occasional assertion failure that indicated
I was using the wrong env occasionally.  I'm not super confident in
this because I've seen the env for a thread change, but that could be
due to reuse of the thread id.
 2014-10-22 06:58:42 -07:00
Eric House
452729fb9d merge android_branch 2014-10-17 18:36:08 -07:00
Eric House
53d2c2f0f2 rename method 2014-10-17 18:35:14 -07:00
Eric House
f1e6e2f8f5 can't assert yet -- breaks upgrade 2014-10-17 07:58:26 -07:00
Eric House
df093e1c10 preexisting db field now a set, so treat it that way in the other place it's read 2014-10-17 07:55:04 -07:00
Eric House
4e37947d94 assert, for now at least, no unexpected types being added from jni world 2014-10-17 07:54:34 -07:00
Eric House
7cef0c8c06 un-stub-out summary info 2014-10-17 07:47:48 -07:00
Eric House
2e74b97b4a oops: set typeset field in java struct 2014-10-17 07:46:32 -07:00
Eric House
3dfb4ae6f8 Merge remote branch 'origin/android_branch' into android_branch 2014-10-16 20:48:39 -07:00
Eric House
39f8ec4734 expand pattern to match newer .apks 2014-10-16 20:47:43 -07:00
Eric House
ed1b6af246 turn on -std=c99 2014-10-16 20:21:32 -07:00
Eric House
ebfe8ceb28 use Collections.toArray() rather than roll my own 2014-10-16 20:16:50 -07:00
Eric House
dd00ba477b fix mistaken commit: uncomment 2014-10-16 20:16:35 -07:00
Eric House
878a16b3bc snapshot: android compiles, and works well enough to exchange moves 
via relay!  Lots of changes, mostly around treating connTypes as a Set
inside the java world.  Jni to translate to that is a pain.
 2014-10-16 06:45:24 -07:00
Eric House
215cbe94ba turn on -std=c99 2014-10-15 21:43:34 -07:00
Eric House
76db94effc move git rev pref to bottom 2014-10-14 06:35:12 -07:00
Eric House
5c4242ac62 Fix (by inspection) NPE reported to google: test for null lock before 
trying to save its game. Also remove empty overridden method.
 2014-10-14 06:31:57 -07:00
Eric House
f14c3216a5 commit changes that have been running for a while 2014-10-13 19:10:56 -07:00
Eric House
bf1f0485df include git hash in name of .apk file 2014-10-13 19:06:40 -07:00
Eric House
858187b9d7 include git rev hash in update info -- for later use detecting when a 
tagged build has changed
 2014-10-13 07:20:17 -07:00
Eric House
518a6a903d list one more change 2014-10-13 06:48:00 -07:00
Eric House
fd7a03dfc4 remove logging 2014-10-13 06:47:49 -07:00
Eric House
4914e5b564 up strings and change log for new release 2014-10-12 21:12:25 -07:00
Eric House
501f9ad3d9 don't assume group will be found among visible views 2014-10-12 20:51:54 -07:00
Eric House
509df4cad5 add comment 2014-10-12 08:55:07 -07:00
Eric House
0770062559 when it becomes the turn of a game in a non-expanded group, update 
that group to show it now contains an in-turn game.
 2014-10-12 08:13:02 -07:00
Eric House
e87457cfbe cleanup: a view can always call getContext() 2014-10-10 08:01:08 -07:00
Eric House
9d038d13e4 add "new group" button to move game alert, and logic to relaunch the 
move game alert after new group alert exits.
 2014-10-10 07:29:36 -07:00
Eric House
019daa6b84 Fix robot and human default dicts being able to be of different 
languages: add new languages pref above the two, filter their choices
to be limited to that language, and change them to the first dict of
the new language when it's changed.
 2014-10-09 08:03:25 -07:00
Eric House
4f22caafe9 don't assume there was only one missing after downloading first 
missing dict
 2014-10-09 06:31:43 -07:00
Eric House
d308baca8c add blank line so easier to read 2014-10-09 06:30:00 -07:00
Eric House
74eb6890b9 when user while configuring game chooses to download a new wordlist, 
make it the new selection in the spinner from which "Download more"
was chosen.
 2014-10-08 19:12:00 -07:00
Eric House
e4e5d599cd Fix new game process to not leave unconfigured new game behind when 
user chooses to configure then cancels.
 2014-10-07 06:52:55 -07:00
Eric House
095011020d cleanup 2014-10-07 06:07:30 -07:00
Eric House
6d5a556c78 break up chained method calls so stack crawls can more accurately show 
source of a crash.
 2014-10-07 06:02:00 -07:00
Eric House
a28dc8c182 catch up with comments added 2014-10-01 22:11:58 -07:00
Eric House
618d180aab fix broken about dialog 2014-10-01 22:10:42 -07:00
Eric House
731e2c49e0 call server_do even if not a client, fixing weeks-old breakage of 
local-only games.  git bisect rocks!!
 2014-10-01 21:54:23 -07:00
Eric House
aade0a9aae cleanup 2014-10-01 08:08:45 -07:00
Eric House
76fb527b11 Handle NFC-invite case same as BT one: create a needs-download 
notification rather than a broken game when required wordlist is
missing
 2014-10-01 07:36:34 -07:00
Eric House
c1445f11b8 tweak text 2014-10-01 06:45:24 -07:00
Eric House
615d558fac revert 44e0f30520: no longer required 
and I'm afraid of changes elsewhere the function's used
 2014-10-01 06:32:09 -07:00
Eric House
8b15895380 forget about creating games when wordlists are missing. Instead adopt 
the SMS strategy and post a notification response to which opens a
download-or-decline dialog. On finishing the download open and connect
the game.
 2014-10-01 06:24:52 -07:00
Eric House
2be0db06ea revert list item change (but keep the padding) 2014-10-01 06:06:47 -07:00
Eric House
e5ae23bf67 try again on dict download to open game, but test first. 2014-09-30 22:02:17 -07:00
Eric House
3c79ea51c3 more helpful hint 2014-09-30 21:56:13 -07:00
Eric House
8b95cbb68a remove unnecessary level of layout nesting, and add padding. 2014-09-30 21:55:52 -07:00
Eric House
d8f93080bf force the language that's the point of opening the dicts downloader to 
be displayed expanded to make it a bit easier to figure out what to
do.
 2014-09-30 21:48:01 -07:00
Eric House
44e0f30520 modify anyMissing[dict] logic: having some null is ok, but all null is 
not.
 2014-09-30 21:26:34 -07:00
Eric House
8cc6f8b7cd don't open games created by BT invitation without checking that they 
have the dicts they need.
 2014-09-30 21:26:02 -07:00
Eric House
b62e4db8d2 better string 2014-09-30 21:21:03 -07:00
Eric House
fa3a2c1c5e don't crash if somehow a game gets opened without a dict 2014-09-30 21:20:47 -07:00
Eric House
8e9ca8603d don't recalc menu and title too early 2014-09-29 20:12:56 -07:00
Eric House
69889c4382 don't set as selected a game inside a collapsed group 2014-09-29 08:16:24 -07:00
Eric House
55ea4d7a04 cleanup 2014-09-29 08:15:41 -07:00
Eric House
afedc8d9f5 fix prev optimization clearing board on load so it only happens when a 
different board is about to be drawn.  Fixes flash when btinvite
dialog goes away.
 2014-09-29 07:26:39 -07:00
Eric House
0f90538598 track whether invite progress is up and cancel only if it is 2014-09-29 06:19:52 -07:00
Eric House
321a6e7e73 add activity lifecycle logging, off by default 2014-09-29 06:18:48 -07:00
Eric House
9b845634e0 show progress when sending BT invitation -- since it might be a 
headset and take a while to time out.
 2014-09-27 07:16:36 -07:00
Eric House
75981f52ca up strings for new release, including changelog 2014-09-25 18:36:50 -07:00
Eric House
f3acdfc78a remove bt error count toast 2014-09-25 18:36:22 -07:00
Eric House
a0881b1041 add titles to SMS and BT invite alerts 2014-09-25 07:49:22 -07:00
Eric House
47591fb8c6 For SMS and BT, text contains the text of a button. Substitute in 
button text rather than have to keep the two in sync.
 2014-09-25 07:34:58 -07:00
Eric House
e0eb22854f save changes to address list 2014-09-25 07:06:33 -07:00
Eric House
2beb897b2c replace scan that tries to connect to all paired devices, taking 20 
seconds to discover that some 20-miles-away device isn't here and
resisting use of concurrency, with simple listing of paired
devices. If user tries to invite a headset, try and fail with an error
message.  Fix up re-invite and detection of whether players are
missing to support this.
 2014-09-25 06:40:44 -07:00
Eric House
4c2c6e5814 improve bad-protocol messaging: suggestion to upgrade is displayed on 
both sides.
 2014-09-22 08:09:58 -07:00
Eric House
59f5c17e78 remove debugging toast 2014-09-22 08:00:37 -07:00
Eric House
46907ec03d tweak string 2014-09-22 06:59:23 -07:00
Eric House
45317678b7 a better way of cleaning up 2014-09-21 21:59:21 -07:00
Eric House
73e5f946b2 cleanup: private method to reduce number of params required 2014-09-21 21:54:00 -07:00
Eric House
c5b948b464 offer to launch Setting app when there are no paired devices 2014-09-21 18:03:31 -07:00
Eric House
7964f96b28 include gameID in bt ping, and in reply a boolean indicating if it's 
been deleted. Means you open a game and if you have a connection know
immediately that it's no longer there.
 2014-09-21 17:32:35 -07:00
Eric House
dbb09241ec save known bt addresses only; names can be looked up 2014-09-21 17:03:25 -07:00
Eric House
e69f0179cc fix script 2014-09-21 16:59:00 -07:00
Eric House
0073cba698 cleanup: get rid of btName wherever possible 2014-09-21 14:59:28 -07:00
Eric House
653ad7c62a cleanup how bt names and addresses are handled, working with addresses 
except when something has to be shown in the UI.  Because names can be
duplicated but never addresses....
 2014-09-21 14:40:44 -07:00
Eric House
0d04fd138d ping remote BT hosts on game open and on radio on in order to update 
the status of the connection arrows.
 2014-09-21 13:06:12 -07:00
Eric House
4695619c63 refactor: add methods to be called from elsewhere 2014-09-21 11:35:32 -07:00
Eric House
e52422afcc reflect bt radio state in in-game net status handler 2014-09-21 10:55:13 -07:00
Eric House
ff82ff1e7c add connType param to resendAllIf(): no point resending relay messages 
when it's the BT radio that just turned on.
 2014-09-19 05:53:49 -07:00
Eric House
645da39e51 use new convenience method 2014-09-18 06:10:55 -07:00
Eric House
2e6993cce0 show bt status red when bt radio turned off 2014-09-18 06:08:43 -07:00
Eric House
36bed8a2c8 call super 2014-09-17 08:03:43 -07:00
Eric House
e6203182ec resend pending messages when BT radio comes back on 2014-09-17 08:03:12 -07:00
Eric House
b97a9518f7 better newbie hint title 2014-09-17 08:02:33 -07:00
Eric House
2321b36bec better newbie hint title 2014-09-17 08:01:58 -07:00
Eric House
e018d136e1 don't disable general beaming, since that prevents default behavior of 
launching the store to install on a device that doesn't have the app
yet.
 2014-09-17 07:10:41 -07:00
Eric House
810ccb5555 add padding 2014-09-17 07:05:32 -07:00
Eric House
e3667dde2f remove do-you-want-to-invite dialog when NFC used for relay case too 2014-09-17 06:52:57 -07:00
Eric House
e7e04fc2bb don't offer to nfc-invite a SMS game since that doesn't work, and DO a 
relay game since that does.
 2014-09-16 07:41:09 -07:00
Eric House
9df2d0c1dc keep track of BT IOExceptions, and report the number back to callers. 
At least one app I've seen tells the user to restart BT if that number
gets too high; this makes that easy.
 2014-09-16 07:25:31 -07:00
Eric House
cfba0411fe hide the expandable headers completely when BT or SMS isn't available 2014-09-16 06:42:53 -07:00
Eric House
3e72da8e3f when sms pref changes, clear cached value 2014-09-16 06:39:46 -07:00
Eric House
82b25d1956 add utility method 2014-09-16 06:39:06 -07:00
Eric House
567f6a2ac0 turn off beaming except where I provide an explicit message 
(callback), since it's confusing to have the game offer to beam where
all that's being sent is the install URL.  Hmmm -- maybe we do want
that.  Consider....
 2014-09-15 08:03:14 -07:00
Eric House
aeeb3dc3bc fix so when BT invite is tapped for game requiring a missing wordlist, 
an offer's made to download and only then is game created.
 2014-09-15 07:41:26 -07:00
Eric House
77192bf3bd clear/erase board bitmap before reusing for new game 2014-09-14 15:18:36 -07:00
Eric House
2c8d356ac0 changes to generated files that should have gone with prev commit 2014-09-14 14:50:19 -07:00
Eric House
808e01b428 cleanup: there's no progress to be shown now when inviting 2014-09-14 14:42:58 -07:00
Eric House
45a1dcd5f9 This comment meant for this fix, not prev! : 
Fix board sometimes coming up half-height by indicating that it should
never have a soft keyboard associated with it.  It's otherwise getting
told its height is half what it should be, and I can't find any way to
get the layout redone when the keyboard goes away.  (The keyboard in
this case is leftover from the previous activity.)
 2014-09-14 14:37:01 -07:00
Eric House
134f7dbe2b fix board sometimes coming up half-height by indicating that it should 
never have a soft keyboard associated with it.  It's otherwise getting
told its height is half what it should be, and I can't find any way to
get the layout redone when the keyboard goes away.  (The keyboard in
this case is leftover from the previous activity.)
 2014-09-14 14:36:13 -07:00
Eric House
434bbf74cb when inviting to a new BT game, make it so the games come up on both 
sides already connected and ready to play.  That requires creating the
game on the sending side before the send so it's ready to receive
messages, and on the receiving side giving the new game a message sink
via which to send its initial registration message.
 2014-09-14 13:43:41 -07:00
Eric House
6f07098cf3 return succes from server_initClientConnection() 2014-09-14 13:42:11 -07:00
Eric House
b6f708ee75 add text to missing player alert suggesting tap-to-invite, and dismiss 
it if user does so while it's still up (via a bit of a hack).
 2014-09-12 07:10:18 -07:00
Eric House
94b51cf53b cleanup; log non-hex gameid too for easier searching 2014-09-12 06:07:32 -07:00
Eric House
b1ea1185f1 tweak invite-received strings. Alas, the inviting player's name isn't 
there yet.
 2014-09-12 05:56:30 -07:00
Eric House
ebb9684cc9 remove bt variant files too, at least on this branch 2014-09-12 05:47:03 -07:00
Eric House
172d01137a copy stuff required to make main app support BT 2014-09-11 20:42:15 -07:00
Eric House
0924a20a66 sometimes a null addr comes in; check 2014-09-11 19:55:12 -07:00
Eric House
640283263a remove XWords4-sms files; that ship has sailed 2014-09-11 19:40:31 -07:00
Eric House
2a0489889c when the number of available BT devices matches the number of players 
sought, check them all initially.  Speeds inviting for most common
case.
 2014-09-11 08:05:43 -07:00
Eric House
588e5245d5 log dropped result 2014-09-11 07:20:59 -07:00
Eric House
c47c8928ec open BT game after creating it on invite/nfc reception; remove game 
from games list selection when it's deleted by board when open so
action bar is in correct state.
 2014-09-11 07:06:12 -07:00
Eric House
a08292a918 Handle invite to BT game via NFC. 2014-09-10 07:24:12 -07:00
Eric House
3b2a537e93 fix crash trying to create new game immediately after allowing board 
to delete one.
 2014-09-10 07:01:56 -07:00
Eric House
39b9c32fd7 don't track and refuse to connect to deleted games: the tracking was 
incomplete (didn't persist) and gameIDs couldn't be reused.  Fix later
when it's not blocking development if the feature still makes sense.
 2014-09-09 07:27:04 -07:00
Eric House
95eb140461 cleanup 2014-09-09 07:24:27 -07:00
Eric House
4029af955d inval cache twice, fixing a race condition around creating new BT games 2014-09-09 07:24:17 -07:00
Eric House
46e648933a Log, but don't assert, when an event isn't handled. 2014-09-09 07:23:52 -07:00
Eric House
df6a117c5c cleanup 2014-09-09 07:21:33 -07:00
Eric House
4f6fb61d4b put BT ahead of SMS, and use a style to reduce repeated layout code 2014-09-08 20:42:18 -07:00
Eric House
2400029b8b force all comms-type icons to have same width 2014-09-08 08:02:12 -07:00
Eric House
03c6db78db add new class that's a header-styled label with an expander, and use 
that as separator in NewGame activity.  Save expanded state so people
who don't play networked games don't have to see all that text
forever.
 2014-09-08 07:30:07 -07:00
Eric House
473bea77d6 get rid of -i param; instead install to all devices instead of passing 
'install' to ant.
 2014-09-08 07:25:05 -07:00
Eric House
fdde7b67bc ignore dirs for another branch (local only so far) 2014-09-08 07:06:45 -07:00
Eric House
5fbe98e4e2 remove unused string 2014-09-06 06:56:06 -07:00
Eric House
9c0fc39478 add move summary to SMS notifications too 2014-09-06 06:54:43 -07:00
Eric House
c6a9f303f0 include last move summary in BT notifications 2014-09-06 06:47:24 -07:00
Eric House
c1ee254c4f echo what's going on 2014-09-05 21:19:32 -07:00
Eric House
ddc4ab9844 oops: MultiEventListener installation got dropped with the move to 
activity delegates; fix
 2014-09-05 21:12:35 -07:00
Eric House
1d4d3a7a32 don't use same title for all progress dialogs 2014-09-05 07:49:37 -07:00
Eric House
d949028006 set names as properties; param doesn't seem to work 2014-09-05 07:41:06 -07:00
Eric House
a2853046d4 set names as properties; param doesn't seem to work 2014-09-05 07:40:54 -07:00
Eric House
b9aa335027 log dropped event 2014-09-05 07:40:37 -07:00
Eric House
5035042ce4 rename script, and add install option so can work with multiple devices 2014-09-05 07:29:03 -07:00
Eric House
0b2c029e67 ignore new file 2014-09-05 07:28:10 -07:00
Eric House
eb2cd37980 fix crash by overriding with correct signature 2014-09-05 07:05:14 -07:00
Eric House
b9d9fc2520 put back auto-scp of finished file to server 2014-08-29 07:33:21 -07:00
Eric House
4df0f7ffd2 add option to get new .apk file name into a file 2014-08-29 07:21:54 -07:00
Eric House
ec3168e27d fix, I hope, the occasional misssing notification body by handling the 
case where multiple move messages are handled at once.
 2014-08-29 07:00:27 -07:00
Eric House
72b506b2e7 if unset in jni world this thing is invalid 2014-08-29 06:59:24 -07:00
Eric House
9e86874e77 catch bt version up 2014-08-27 20:23:57 -07:00
Eric House
3858eb2f1d up strings for release 2014-08-27 07:06:35 -07:00
Eric House
78581490eb don't show survey link yet: it's not ready 2014-08-27 07:06:29 -07:00
Eric House
8407d3b300 cleanup and list changes 2014-08-26 22:17:34 -07:00
Eric House
5343b054a5 include number of tiles in trade confirm message 2014-08-26 21:58:55 -07:00
Eric House
d8266f6a2c tweak title and body of notification 2014-08-26 21:53:28 -07:00
Eric House
88248131da show new client-formatted turn summary in notification; remove old 
common-formatting code.
 2014-08-26 21:37:33 -07:00
Eric House
2d08848715 snapshot: toward having a better description of the last move in 
notifications.
 2014-08-26 06:55:26 -07:00
Eric House
d255231179 enable changing reminder intervals via debug setting, and format time 
since last move dynamically using days, hours and minutes.
 2014-08-22 20:37:50 -07:00
Eric House
880f8f123a list rest of changes 2014-08-20 07:10:53 -07:00
Eric House
e7af6949fe cleanup after code review 2014-08-20 07:10:40 -07:00
Eric House
a464b61a15 fix so net status icon isn't on top of timer 2014-08-19 07:50:15 -07:00
Eric House
815bc9544e don't crash when player has a password set! (was inflating view from 
background thread, now a no-no)
 2014-08-19 07:30:14 -07:00
Eric House
36afbb7330 fix nag timer math 2014-08-19 06:50:10 -07:00
Eric House
69482bf442 cleanup: move functions from Utils to DelegateBase (and make non-static) 2014-08-19 06:46:03 -07:00
Eric House
38b9420fa0 move survey-display logic into one place so it's always right 2014-08-18 07:53:23 -07:00
Eric House
432badf889 trying again to get survey display logic right 2014-08-18 07:35:40 -07:00
Eric House
e04f7c8f35 fix survey request display logic 2014-08-18 07:28:28 -07:00
Eric House
b278696a30 up strings for new version 2014-08-18 07:17:45 -07:00
Eric House
f374d67aab only show the survey invitation when this isn't the first version 
you've installed, i.e. after at least one upgrade.
 2014-08-18 07:12:50 -07:00
Eric House
ad7a32504a switch to nag times for ship 2014-08-18 06:53:40 -07:00
Eric House
c83e7773fb make changes an html file in assets, and load via url; add 
surveymonkey url
 2014-08-15 20:59:28 -07:00
Eric House
1f9be1d03c cleanup 2014-08-14 06:13:23 -07:00
Eric House
bee97f8862 tweak text of reminder (prev-known-as "nag") message to be less harsh 2014-08-12 07:17:36 -07:00
Eric House
67c18f4653 tweak nag message to include the name of the player who last moved 2014-08-11 19:16:39 -07:00
Eric House
50cb87901e warn in hours hours; tweak final warning 2014-08-11 06:27:16 -07:00
Eric House
ac6cda33aa tweak text and test intervals 2014-08-10 20:18:05 -07:00
Eric House
4f514c2e16 cancel notifications by rowid for non-networked games too 2014-08-10 20:13:13 -07:00
Eric House
3655d0c9ff nag based on a array of times rather than a fixed interval, and append 
an additional warning after the last is used.
 2014-08-10 19:58:03 -07:00
Eric House
8c3180573a pass milliseconds, not seconds (and be careful to cast early) 2014-08-10 19:46:00 -07:00
Eric House
1493895428 add utility date formatting functions 2014-08-10 19:45:04 -07:00
Eric House
bc33d0b81f add comment 2014-08-10 19:44:40 -07:00
Eric House
feb9510b9d deselect games in group when it's collapsed 2014-08-10 15:42:43 -07:00
Eric House
007b390c42 fix crash downloading updates: requestWindowFeature() must be called 
earlier, from activity's onCreate
 2014-08-10 11:32:46 -07:00
Eric House
9e763b4049 post actual notifications (with text yet to be improved) 2014-08-09 21:00:53 -07:00
Eric House
5230593276 update with new receivers 2014-08-09 18:09:49 -07:00
Eric House
4d4548adc7 toward tagging players who're waiting too long to make a move: store a 
nagTime when saving a game that's some interval in the future IFF it's
a local player's turn.  Set an alarm for the soonest nagTime.  The
alarm seems to be firing at the right time, so what remains is to post
notifications.  Also, rather than have two Receivers listening on boot
event added a new one whose sole job that is (and that kicks off other
stuff on boot.)
 2014-08-09 18:07:49 -07:00
Eric House
bed04e36c8 add new DB field to track when user should next be nagged about not 
having taken his turn.
 2014-08-09 17:53:04 -07:00
Eric House
8b4519da74 merge in one more Delegate change from dualpane2 2014-08-09 10:54:21 -07:00
Eric House
59640f59e1 remove unused method added by merge 2014-08-09 10:45:43 -07:00
Eric House
409085dd25 cleanup: remove duplicate methods 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListActivity.java
 2014-08-09 10:45:05 -07:00
Eric House
91e2edecf4 manually merge in improvements to activity/delegate interaction made 
toward dual-pane effort.
 2014-08-09 10:33:05 -07:00
Eric House
bbc3d0e8e3 merge fix_android_beta_86 -> android_branch 2014-07-30 07:24:47 -07:00
Eric House
b532883361 up strings for new release 2014-07-30 07:10:53 -07:00
Eric House
7f880627ec don't create toolbar unless required widgets are present in layout, 
then test for null toolbar before use. Fixes NPEs on small screens.
 2014-07-30 07:07:00 -07:00
Eric House
f01d12035b test for null (though should not be required to fix this) 2014-07-30 07:05:49 -07:00
Eric House
f093aba1a6 add missing ID so background coloring can work 2014-07-30 07:05:34 -07:00
Eric House
129f404026 do setup correctly from both constructors 2014-07-30 07:03:44 -07:00
Eric House
d51dd6ae7a pass new interfaces into Delegates rather than Activities to get ready for Fragments 2014-07-25 11:17:22 -07:00
Eric House
2d00a7d1ed add bug fix comments 2014-07-24 21:46:37 -07:00
Eric House
683302f40e remove views before adding new one. This shouldn't be possible, but 
google's received reports of it happening.
 2014-07-24 21:46:23 -07:00
Eric House
c3f4e5323c Fix (by inspection) NPE reported through google 2014-07-24 21:20:15 -07:00
Eric House
33bbbfeec7 change strings for next release 2014-07-24 20:47:54 -07:00
Eric House
3f9ed94ddc final tweak to changelog 2014-07-23 07:08:14 -07:00
Eric House
454ef51cf1 use a single toolbar layout inflated from its own xml rather than 
hard-coded as part of board
 2014-07-22 19:38:32 -07:00
Eric House
9c1b4454eb add back vertical version of toolbar so board can be bigger in 
landscape mode
 2014-07-22 08:11:15 -07:00
Eric House
e4c3e9fe13 remove dead code 2014-07-21 22:24:50 -07:00
Eric House
6ac5f2177f catch up with recent changes 2014-07-21 22:13:32 -07:00
Eric House
a84194c180 ignore new files 2014-07-21 21:57:28 -07:00
Eric House
46bc0e01fe up strings for new release 2014-07-21 21:42:10 -07:00
Eric House
83636b6736 clean up trade UI setup 2014-07-21 21:34:52 -07:00
Eric House
38afc4494a fix board toolbar to be centered AND fully available 2014-07-21 20:00:17 -07:00
Eric House
f305e6dc8d center toolbar. This isn't ideal, especially for the existing portrait 
layout, but it's much better for landscape.
 2014-07-20 19:52:17 -07:00
Eric House
71b2afefbc use cell width for status width 2014-07-20 14:22:35 -07:00
Eric House
8b26a5316d toward putting the status icon in the right place 2014-07-19 21:04:33 -07:00
Eric House
5825b9e056 don't set rect that won't be used 2014-07-18 21:31:21 -07:00
Eric House
0f617d359b fix so space opening up in landscape board layout is colored in 
user-settable background color rather than white
 2014-07-18 21:29:29 -07:00
Eric House
550e637440 cleanup 2014-07-18 21:28:31 -07:00
Eric House
a902bdcbad limit width of scoreboard too 2014-07-17 21:31:17 -07:00
Eric House
aa811f11eb test screen size in deciding to allow rotation 2014-07-17 21:30:53 -07:00
Eric House
d51a5e67f0 fix for super-wide screen: tiles are never wider than tall. Next: 
scoreboard.
 2014-07-17 08:01:00 -07:00
Eric House
35248cbef4 reduce min font size 2014-07-16 21:36:42 -07:00
Eric House
694d88bbdb Add preference that, if set, allows board to display in landscape 
orientation.  Later a test for screen size will do the same (with
debug pref overriding it to ease testing.)  Board looks like crap in
that mode; will fix next.
 2014-07-16 20:11:55 -07:00
Eric House
d37ed8ca2a move onWindowFocusChanged() into superclass 2014-07-16 19:54:13 -07:00
Eric House
6e3563aefc remove french strings: translator hasn't seen them let alone approved 
for release
 2014-07-16 06:35:15 -07:00
Eric House
ddd1ef70b6 prevent games reset at the same time from all having the same seed by 
passing rand()'s seed from java world rather than using current
seconds.
 2014-07-15 07:32:57 -07:00
Eric House
467477843b turn proguard back Off. Will get it working on another branch. 2014-07-14 22:37:10 -07:00
Eric House
591926b46c adding file required for proguard 2014-07-14 21:46:09 -07:00
Eric House
3277ffab82 turn on proguard 2014-07-14 21:44:54 -07:00
Eric House
031cd613c1 Don't upload .apk as part of this script. Maybe later as part of -clone.sh. 2014-07-14 21:40:31 -07:00
Eric House
5da0a78710 remove logging 2014-07-14 07:34:16 -07:00
Eric House
079859f510 fix new game creation putting list into state where games couldn't be 
launched: don't use m_launchedGame except to track that the UI's
launched a game.
 2014-07-13 09:09:48 -07:00
Eric House
229d179b46 "studylist" more consistent than "list" 2014-07-13 09:06:14 -07:00
Eric House
d841a1b00d tweak to encourage crash reporting 2014-07-13 09:05:50 -07:00
Eric House
e6d817e687 add partial French translation (for testing) 2014-07-12 16:19:40 -07:00
Eric House
58a18534b0 tweak changes 2014-07-12 16:12:18 -07:00
Eric House
37c6db8ffc include language in toast confirming addition to wordlist 2014-07-12 16:06:18 -07:00
Eric House
03843e77d1 on return from selecting a new language while creating a game, change 
players' wordlists to match
 2014-07-12 15:50:01 -07:00
Eric House
7e9c156747 expand/contract wordlist groups via tap on group as well as its arrow 
button
 2014-07-12 15:34:30 -07:00
Eric House
75e54fa727 don't reuse game list group if it's had its background changed since 
that can't be undone (yet)
 2014-07-12 11:04:41 -07:00
Eric House
3530e51102 remove unused variable 2014-07-12 10:51:57 -07:00
Eric House
a19437e2d2 use a style for elements common to group headers 2014-07-11 21:38:17 -07:00
Eric House
25d4b0a375 add groups info cache inval so when empty group gets a new game it 
grows an expand button
 2014-07-11 07:31:50 -07:00
Eric House
8dd1771a37 fix crash deleting two games in a row: don't set a game as selected 
after it's been deleted, and delete games in-place from the list
rather than remaking the adapter.
 2014-07-11 06:59:23 -07:00
Eric House
6fd0bcec49 Optimization: keep ivars pointing at subviews rather than calling 
findViewById each time a GameListItem is recycled.
 2014-07-10 06:31:43 -07:00
Eric House
e674ae4a3c recycle views for games list elements too 2014-07-10 06:24:35 -07:00
Eric House
f3f5bf10a5 Recycle convertView for dicts list elements. Next: games list. 2014-07-10 06:15:09 -07:00
Eric House
1864675196 toward being able to reuse views 2014-07-09 21:45:22 -07:00
Eric House
272fabacfc fix studylist option being ignored when launching lookup where 
language has only one lookup url
 2014-07-09 06:44:48 -07:00
Eric House
5d31671514 save dict to tmp file, renaming only after download is successful. 
Fixes crashes when half-saved files are loaded.
 2014-07-08 20:53:09 -07:00
Eric House
501227858b make two activities handle config changes like all the others 2014-07-08 20:50:26 -07:00
Eric House
3472296bf4 generated translations 2014-07-08 07:11:24 -07:00
Eric House
9cc4c146aa add newbie hint about wordlist browser 2014-07-08 06:50:39 -07:00
Eric House
1942628584 up strings for release 2014-07-08 06:17:20 -07:00
Eric House
71fce9bf15 make dict (or app) download cancellable 2014-07-07 07:58:41 -07:00
Eric House
7b556af135 remove unused string 2014-07-06 21:38:36 -07:00
Eric House
6a94741c61 fix so game most recently opened is selected after return to list 2014-07-03 17:42:03 -07:00
Eric House
41dbc5dfa3 remove logging when file-not-found 2014-07-03 17:25:29 -07:00
Eric House
8af99e39d1 implement move-groups inside superclass (though only one subclass uses it now) 2014-07-02 21:56:42 -07:00
Eric House
653a1082d9 give list adapters a common superclass and move expand/contract logic 
there.  To do: moving of group-moving logic.
 2014-07-02 06:28:15 -07:00
Eric House
812d533d10 move list adapter for games list into GamesListDelegate, simplifying 
it and speeding it up.  It still gets tossed out too often; next task
is to call mkListAdapter() less frequently.
 2014-06-28 15:39:06 -07:00
Eric House
cdf5d6ec9a new commented-out formatting utility 2014-06-28 15:38:14 -07:00
Eric House
177fbb0bad uncheck box as soon as download cancelled (and dismiss rather than 
cancel the progress dialog so cancel listener doesn't get called on
normal completion)
 2014-06-28 10:57:18 -07:00
Eric House
aa7c3a18e3 when user has to download a dict in order to reset a game (bad, but 
too hard a requirement to remove), once the dict's downloaded continue
to reset, not open, the game.
 2014-06-28 10:42:33 -07:00
Eric House
a20339df99 tweak newbie message 2014-06-28 10:13:18 -07:00
Eric House
5c5ddd5ecd fix delete dicts warning to catch case of nuking all the lists for a 
language at once.  To simplify (coding and user experience), don't
bother with case where user will have to switch to another list before
opening a game.  May want to reconsider this.
 2014-06-27 08:29:42 -07:00
Eric House
38b37643f4 call mkListAdapter in a couple of places exposed now that it's not called in onResume 2014-06-24 22:04:59 -07:00
Eric House
f2eea61a76 name lang 0 "unknown", and display dicts with langs outside the known range there. 2014-06-24 21:33:44 -07:00
Eric House
d062508929 no need to rebuild list onResume 2014-06-24 21:32:49 -07:00
Eric House
c82ec8b646 use lang name, not code, to build download URL. Fixes download of Experimental lists. 2014-06-24 08:18:42 -07:00
Eric House
e36f68a1d0 make list item text elements single-line to prevent long-named 
wordlists from looking ugly
 2014-06-24 08:18:42 -07:00
Eric House
eac5e1dd65 cancel wordlist download/digesting when progress dialog dismissed 2014-06-24 08:18:42 -07:00
Eric House
39809e49aa fix another NPE (though these don't occur on older devices) 2014-06-24 08:18:42 -07:00
Eric House
7e515b19c9 fix NPE in studylist; cleanup duplicated method 2014-06-24 08:18:42 -07:00
Eric House
4d9c7c97ba Merge remote branch 'origin/android_localize' into android_localize 2014-06-24 08:16:56 -07:00
Eric House
d1f3648390 better shelf clearing 2014-06-24 08:16:01 -07:00
Eric House
23aa211a75 don't insist on presence of game's dict when deleting game 2014-06-23 08:14:19 -07:00
Eric House
91db8d9cdb track which list items are expanded so when rebuilt (e.g. after 
scrolling out of sight) the retain their state.  (Not preserved across
invocations of the activity.)
 2014-06-23 08:03:48 -07:00
Eric House
0749266ec3 remove padding 2014-06-22 16:05:46 -07:00
Eric House
46fba6204a switch to providing details about remote wordlist via expanding view 
rather than a separate alert.
 2014-06-22 13:36:25 -07:00
Eric House
91fe1537cb specify orientation (no change, since it's the default) and make 
formatting standard.
 2014-06-22 12:41:25 -07:00
Eric House
0c1d9661df make downloadable checkbox bigger and easier to hit 2014-06-22 12:00:30 -07:00
Eric House
4f093d13c1 change download checkbox string 2014-06-22 11:59:35 -07:00
Eric House
e3ca40c221 make prompt clearer 2014-06-22 11:15:44 -07:00
Eric House
8783822bdc fix crash after lookup of word when language has only one URL 
(e.g. Dutch) by not skipping the LookupAlert dialog in that case.
 2014-06-22 11:12:31 -07:00
Eric House
e9608a867e use existing wrapper method rather than calling on activity 2014-06-22 10:40:20 -07:00
Eric House
e1f7c13fc7 print wordlist count as part of group title 2014-06-22 09:42:08 -07:00
Eric House
cf0c864553 rename method 2014-06-20 18:44:47 -07:00
Eric House
509dfb4b4f launch DictsActivity for result, and have it return the last language 
and wordlist downloaded. Use that information to update the spinner
that launched it so that choosing "download more" then downloading a
German wordlist causes German to be selected.
 2014-06-19 20:42:34 -07:00
Eric House
c31697ea47 tweak DictsDelegate so it works when invoked via "Download more..." 
from GameConfig spinners to add langs and dicts within a lang.
 2014-06-19 07:57:46 -07:00
Eric House
770679daa0 combine window titles since windows are also combined 2014-06-19 07:53:28 -07:00
Eric House
0c2f85d534 put back missing string for game config dialog (missed from prev commit) 2014-06-18 20:51:24 -07:00
Eric House
5568f00dd8 put back missing string for game config dialog 2014-06-18 20:51:00 -07:00
Eric House
975c37ddae add note to info alert, blank if not present 2014-06-18 20:25:45 -07:00
Eric House
927ba028fb cleanup 2014-06-18 20:24:13 -07:00
Eric House
27972d10e7 new files to ignore 2014-06-18 20:23:58 -07:00
Eric House
2c7128ad30 pull note out of dict header 2014-06-18 20:18:09 -07:00