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

447 commits

Author SHA1 Message Date
Eric House
9cbd76aae7 more cleanup; log info toward reuse of list items (looks unlikely) 2012-12-18 07:40:48 -08:00
Eric House
8a58492389 Merge branch 'android_branch' into android_groups 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DBUtils.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameListAdapter.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
 2012-12-18 06:35:07 -08:00
Eric House
51a5e80a26 mention attachment in invite email text 2012-12-16 15:13:36 -08:00
Eric House
b2bd6ce662 add and use preference for square rack tiles, removing code that alternated for testing purposes. 2012-12-11 07:25:43 -08:00
Eric House
bda0d51c7f add Rematch button to game over dialog -- which only puts up notImpl 
toast so far.
 2012-12-02 18:45:35 -08:00
Eric House
c4e638bd84 Merge branch 'android_branch' into android_groups 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DBHelper.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
 2012-12-01 10:52:42 -08:00
Eric House
13b7877a80 put name of file being downloaded in progress dialog 2012-11-30 08:08:45 -08:00
Eric House
32d7daf2b5 warn about duplicate games not just when there's exactly one, and 
include the most recent create time in the warning.
 2012-11-30 07:13:00 -08:00
Eric House
bffb231d13 improve download-or-cancel messages 2012-11-28 21:07:03 -08:00
Eric House
f3ecfa569a get rid of the second URL in invites that's meant for those without 
the app installed.  It's confusing, especially in SMS case, and the
page they see when they don't have the app installed can explain how
to install it.
 2012-11-27 07:02:44 -08:00
Eric House
e590db5f3f merge in the db part of 82c39489f0 
(android_groups branch, local only right now), but not the UI part
since it won't make the next release.
 2012-11-26 08:05:05 -08:00
Eric House
ac435b7857 Merge branch 'android_branch' into android_groups 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
 2012-11-25 14:11:04 -08:00
Eric House
7d6e393007 use a different missing-dict explanation string when the name of the 
inviter isn't known (relay case)
 2012-11-25 09:58:14 -08:00
Eric House
3bff555bfd For move, make current group the default and warn whether there's only 
one.
 2012-11-20 18:34:26 -08:00
Eric House
48dd3bb72e Merge branch 'android_branch' into android_groups 2012-11-20 07:02:27 -08:00
Eric House
b244adae1b fix transposed words 2012-11-20 06:22:29 -08:00
Eric House
face24e915 make invite email text a bit easier to read 2012-11-20 06:10:57 -08:00
Eric House
be3cad96d7 tweak strings 2012-11-19 21:23:07 -08:00
Eric House
1994ea788e don't allow deleting default group. Wording needs fixing, or better 
yet, replace the menuitem with greyed-out "is default group".  But
this works for now.
 2012-11-19 19:28:26 -08:00
Eric House
82c39489f0 lots of changes toward grouping games in user-definable groups. 
Creation and movement between work.  Deletion crashes.  Expansion
doesn't stick.  All's rough.
 2012-11-19 07:41:15 -08:00
Eric House
0376e25c26 Merge branch 'fix_beta_53' into android_branch 2012-11-05 05:43:33 -08:00
Eric House
3942a49cac Add a debug preference allowing to provide, or override, the download 
dir.  This will let users work around bugs on devices like my Blaze 4G
where the OS gives the wrong path, and also allows testing.  Inval
DictUtil's dict cache eash time this is changed, so in effect adding a
wrong path pref hides all dicts in the Downloads dir.
 2012-11-04 17:47:30 -08:00
Eric House
90480aca4c don't put up toast when checking SMS DB 2012-11-04 07:40:24 -08:00
Eric House
364acb6dcd cleanup: remove some logging and unused string resources 2012-11-01 19:32:29 -07:00
Eric House
80a79b6991 Make it less likely that a message received while I'm not intercepting 
them will be opened more than once: track whether I've searched the
SMS db, and only clear that setting when SMS play is *disabled*.
 2012-10-29 21:20:32 -07:00
Eric House
e90621ec1d use existing string rather than invent a new one 2012-10-29 07:30:09 -07:00
Eric House
e39b776d80 Add button to alert warning that SMS isn't on that takes you to 
Preferences.
 2012-10-29 07:20:11 -07:00
Eric House
2375a6730a tweak text 2012-10-27 15:31:49 -07:00
Eric House
5aef1afec3 point URL at android part of sf.net site, not home. 2012-10-27 13:18:08 -07:00
Eric House
aec03fc572 When a game's consumated and guest discovers it isn't using the same 
dict, give chance to switch, and to download if required.  Because of
the way the JNI thread works, and JNI's requirement in general that
env instances match up (e.g. dicts must be destroyed in the same
thread that creates them), substituting into a live game is too hard.
So the game's saved with its new dict and then reloaded.
 2012-10-24 07:17:21 -07:00
Eric House
ca561f225c make dict storage location a default set in preference rather than 
something queried each time.
 2012-10-22 07:06:12 -07:00
Eric House
6ba5d4f7c8 use new internal download code for download to get dict required for 
SMS invite as well.  Still to do: put back the query for where the
thing should be stored.  Hard-coded to go in INTERNAL for now.
 2012-10-20 18:28:14 -07:00
Eric House
04f56ccf74 download dicts without the browser. This is a partial implementation 
that will need to be generalized and used in other places, basically
whenever the full URL can be known.
 2012-10-19 17:57:17 -07:00
Eric House
6c34f43df7 show toast when update requested manually and nothing found 2012-10-18 19:51:40 -07:00
Eric House
e5feded0b1 When receiving an invite for a dict we don't have, post a notification 
to DictsActivity that offers to download, and on download completion
arranges for notification of SMSService so the game can be created.
 2012-10-17 21:20:08 -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
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
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
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
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
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
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
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
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
ade5a84e2d tweak sms plan confirmation text 2012-07-31 07:46:16 -07:00
Eric House
1fe14be9bf less ominous text for new SMS game creation, ominousness having moved. 2012-07-30 07:14:52 -07:00