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

1315 commits

Author SHA1 Message Date
Andy2
f58eded796 fix (assuming diagnosis is correct) NPE crash reported on google site. 2011-06-06 20:06:59 -07:00
Andy2
53b2a3a6b5 Merge branch 'android_branch' into android_invite 
Conflicts:
	xwords4/android/XWords4/res/values/common_rsrc.xml
 2011-06-06 18:55:21 -07:00
Andy2
845b277c01 rename m_path->m_name for consistency 2011-06-06 18:44:29 -07:00
Andy2
c21a494e0b remove unnecessary setAction call. (Haven't tested if others can go.) 2011-06-06 18:32:17 -07:00
Andy2
2ce4c1417c do a better job of figuring out whether to use black or white to 
outline blank tiles.
 2011-06-06 18:28:20 -07:00
Andy2
1f664fa9e8 fix crash launching chat activity -- due to incorrect removal of URI 
code recently.
 2011-06-06 18:15:02 -07:00
eehouse@eehouse.org
b2d62f0f3d Revert "extend code for choosing whether to make arrow white or black based on" 
This reverts commit 1ef67e74eb.
 2011-06-06 18:10:05 -07:00
Andy2
1ef67e74eb extend code for choosing whether to make arrow white or black based on 
background to apply to blank-mark ring.  Fixes disappearing mark when
tile background gets dark.
 2011-06-06 06:52:10 -07:00
Andy2
a6a668881f Merge branch 'android_branch' into android_invite 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
 2011-06-05 10:49:17 -07:00
Andy2
84572c1ed6 get rid of the other places where Uri's being used but a simple name 
is needed.
 2011-06-05 10:44:26 -07:00
Andy2
c46015c514 fix crash on K's G2X due to URI.fromFile() returning a really strange 
path.  I don't need a URI anyway as the path is now just a key for DB
lookup.  So just pass the name as an extra -- and rename variable to
reflect.
 2011-06-05 10:29:33 -07:00
Andy2
d0f0fa04ce set background color of board root view from prefs on creation and 
whenever pref color might have changed.
 2011-06-05 10:20:23 -07:00
Andy2
65efbe38c9 set background color of board root view from prefs on creation and 
whenever pref color might have changed.
 2011-06-03 23:35:06 -07:00
Andy2
3b78bab89d sort by creation time rather than name 2011-05-20 22:55:07 -07:00
Andy2
c9be5b464c actually set the creation timestamp 2011-05-20 22:51:30 -07:00
Andy2
13e8667634 use Player %d when no default player name set 2011-05-20 06:51:13 -07:00
Andy2
3df47f8fe2 separate string for missing player 2011-05-20 06:50:38 -07:00
Andy2
815490fb87 update gi before creating summary. In case of networked game, 
incoming messages may have changed the version inside the jni
(reordered or renamed players) and we want those changes in the
summary.
 2011-05-20 06:44:06 -07:00
Andy2
d554f71e8a cleanup: move invariant out of loop 2011-05-20 06:39:39 -07:00
Andy2
232e4ec1e9 track missing players -- players for whom space is reserved locally 
and whose names have not yet been received from host/server -- as part
of summary.  They can be drawn differently to give a clear visual
indication which games are not in play and for which the user might
want to issue an invitation.
 2011-05-19 22:53:04 -07:00
Andy2
0f45c26aea remove, for now, test that prevents multiple games from a single email 
so on-device testing possible.  Later need to improve the test.
 2011-05-19 06:54:46 -07:00
Andy2
362eb10d9d remove, for now, test that prevents multiple games from a single email 
so on-device testing possible.  Later need to improve the test.
 2011-05-19 06:54:27 -07:00
Andy2
7349a61f5a add market url to install and break ugly/non-localized url out of 
localized strings.xml.
 2011-05-19 06:52:42 -07:00
Andy2
0c3a6d362c when a networked game connects and is missing player, offer to invite 
someone.  Factor out code from create-and-invite path to support this.
Move invite-related strings into resources.  Still untested with
networked device (to send email.)
 2011-05-18 19:00:32 -07:00
Andy2
71afbf617c add empty view so screen is never completely blank 2011-05-18 06:28:44 -07:00
Andy2
55278ab2a2 what I meant to check in. 2011-05-17 18:44:57 -07:00
Andy2
bf4b3c3058 fix hint text to mention only one button, hide that button along with 
the text -- and make the add-game menu item actually work.
 2011-05-17 18:44:34 -07:00
Andy2
bc3e5b5ca4 add defaults for first through fourth player names. Apply them only 
to local, non-robot players, which at the moment means only the first
will get used.  Not sure what the right strategy is now so maybe all
but the first goes away.
 2011-05-17 18:12:23 -07:00
eehouse@eehouse.org
574194cb4f Merge branch 'android_branch' into android_invite 2011-05-16 19:38:25 -07:00
Andy2
9cc2dfca34 include language in set-default-dict message to reinforce connection 
between dict and language.  I really want to lock the two defaults --
force to change both if one is a different language -- but am not sure
it that's easy enough to do quickly (for next beta.)
 2011-05-16 17:58:31 -07:00
Andy2
6b4320e727 start to fill in text for new-game dialog. 2011-05-16 06:35:49 -07:00
Andy2
a89d81587d Merge branch 'android_branch' into android_invite 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2011-05-14 11:54:31 -07:00
Andy2
c996e98624 replace two menuitems, default-robot and default-human, with a single 
that invokes a dialog giving an explanation and three choices: robot,
human and both.
 2011-05-14 11:04:19 -07:00
Andy2
6ee8c171be implement moveDict and redraw row with new location if successful. 2011-05-14 10:12:30 -07:00
Andy2
f914a15b97 comment field GONE by default; revealed when used 2011-05-14 10:07:34 -07:00
Eric House
c99093fb35 Merge branch 'android_branch' into android_invite 2011-05-11 22:04:06 -07:00
Andy2
fe1bec74f5 add context menuitem to move dicts, dialog to confirm, and call 
stubbed-out method to do the actual move.  Still need a title and to
inval so gets redrawn (and to implement the actual move.)
 2011-05-11 19:01:13 -07:00
Andy2
644100a005 Add generic Object cache to work around being unable to subclass an 
object that's defined in a layout file (class cast to the subclass
fails, as you'd expect.)  Will use this to cache a dict's location.
Eventually there needs to be a DB for dict details.
 2011-05-11 18:59:41 -07:00
Andy2
e51b6f3322 add dict's locations to display 2011-05-11 18:07:07 -07:00
Andy2
19ed409dda add notion of dict location, method to get it, and rewrite a couple of 
others to use that.
 2011-05-11 18:06:43 -07:00
Andy2
7d38a629b5 add comment field to XWListItem and its layout. Get elements by id 
rather than position.
 2011-05-11 18:05:41 -07:00
Andy2
8b130521fa Merge branch 'android_branch' into android_invite 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2011-05-10 18:55:13 -07:00
Andy2
b4b54c5fb9 quick hack to open up all groups. Need eventually to remember how 
user sets 'em.
 2011-05-10 18:52:47 -07:00
Andy2
af96e184d7 don't refresh public room names when game is locked. 2011-05-10 18:34:39 -07:00
Andy2
8a8e1c9db0 remove no-op method and call of same 2011-05-10 18:25:27 -07:00
Andy2
472ffd02bf fix getting wrong networked window title even when configuring a 
non-networked game.  And remove no-op method call.
 2011-05-10 18:24:57 -07:00
Andy2
75e41caf90 go back to using XWListItem (with its delete-me X) and get rid of 
delete context menu item.
 2011-05-10 06:31:09 -07:00
Andy2
085748e201 hook up context menus, and add a delete item to replace the 
checkboxes.  Still need to disable it when dict is built-in.  And
maybe add a different menu for languages.
 2011-05-09 18:59:51 -07:00
Andy2
c990900913 cache list of langs. Performance is otherwise abysmal. May need to 
add mechanism to notify when the list is invalidated.  (Or move
caching into DictsLangCache class.)
 2011-05-09 06:49:45 -07:00
Andy2
a559fdaae9 use a built-in layout for top-level rows to get the expander drawn right. 2011-05-09 06:32:30 -07:00