Commit graph

258 commits

Author SHA1 Message Date
eehouse@eehouse.org
574194cb4f Merge branch 'android_branch' into android_invite 2011-05-16 19:38:25 -07:00
Andy2
9cc2dfca34 include language in set-default-dict message to reinforce connection
between dict and language.  I really want to lock the two defaults --
force to change both if one is a different language -- but am not sure
it that's easy enough to do quickly (for next beta.)
2011-05-16 17:58:31 -07:00
Andy2
903b412046 add note that storage location decision isn't permanent 2011-05-16 17:37:52 -07:00
eehouse@eehouse.org
2fae0842c4 Merge branch 'android_branch' into android_invite 2011-05-16 06:44:04 -07:00
Andy2
740c5dd46c up constants and change message for new release 2011-05-16 06:43:42 -07:00
Andy2
6b4320e727 start to fill in text for new-game dialog. 2011-05-16 06:35:49 -07:00
Andy2
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
54a793f6c2 fix to use positional params in format strings 2011-05-14 10:25:58 -07:00
Andy2
aedc3c6cdc fix title -- not showing wordcount any more 2011-05-14 10:10:24 -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
e51b6f3322 add dict's locations to display 2011-05-11 18:07:07 -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
ec1e8674ec replace placeholder language names with empty strings so, maybe, can
elect not to display
2011-05-10 18:36:48 -07:00
Andy2
782a9f1f70 get rid of strings that don't seem to be used anymore. Still need to
pull from localized files.
2011-05-10 18:36:04 -07:00
Andy2
2dbf1ac489 add formatted=false to postpone fix suggested by new version of SDK 2011-05-10 06:27:58 -07:00
Andy2
249402758a add new activity for starting a new game. Has four buttons and
(eventually) explanatory text.  Currently more-or-less works,
including sending an email with a link that when clicked launches
Crosswords.  (Still need to respond to that link on receipt, but I'm
at least pulling out the necessary fields.)
2011-05-06 06:52:10 -07:00
Andy2
a87f90b6e9 up version for b26 2011-05-03 18:47:16 -07:00
Andy2
6e973ba48d tweak wording 2011-05-02 18:40:35 -07:00
Andy2
e1e181949e offer user a choice between using internal and external storage when
downloading dicts.  Still to do: check if external is available before
offering; and either remove ability to download from within config
dialog or offer that choice there.  Or just use a preference to
determine where storage happens.  Also, on emulator game hangs during
download when using external storage.
2011-04-30 14:28:35 -07:00
Andy2
399fc081d7 add menuitem to set default robot dict. 2011-04-27 06:38:45 -07:00
Andy2
ecc5357ef8 up version info, and collapse two locations into one resource entry. 2011-04-25 20:46:23 -07:00
Andy2
60922baf72 bunch of changes moving UI from using one dict per game to one per
player: remove dictName from CurGameInfo and GameSummary classes and
from DB; deal with missing dicts (the warning, fetching and replacing)
when opening games and deleting dicts.  Etc.  Trivial testing passes.
2011-04-21 18:37:11 -07:00
Andy2
40116d792f format "game_name (lang)" using string in resource. 2011-04-11 18:52:10 -07:00
Andy2
c6cd60deef Save and restore per-player dicts; load games that have 'em correctly.
Robots default to BasEnglish dict and humans to CollegeEng.  Add new
per-game default for robot dict.  Still need to deal with language
changes and non-English case in general.
2011-04-11 06:42:17 -07:00
Andy2
97d54c86eb snapshot: track dictName per player in addition to per game. Not yet
used yet; need to pass into jni next.
2011-04-08 06:50:08 -07:00
Andy2
fc4e454d92 bugfix: add background to set of colors restored. 2011-04-08 06:17:35 -07:00
Andy2
6584c69df1 add and honor preference for board background color (e.g. scoreboard
and tray when no tile present).  This may allow a light-on-dark theme.
2011-04-01 07:17:11 -07:00
Andy2
e7ab1c34b7 add more carriage returns for history formatting 2011-03-11 06:52:43 -08:00
Andy2
28f3ad316b hide/show hint at top of games list via a preference rather than the
number of games in the list, and modify hint text to point to the
prefs setting.
2011-03-11 06:44:25 -08:00
Andy2
c909f91a61 fix over-long initial trays in history by adding <cr>. Not sure if
line brakes belong in common code or strings however...
2011-03-10 19:00:15 -08:00
Andy2
d6dd2b942f fix crash tapping player name after a trade -- since the format string
was wrong.
2011-03-10 18:56:13 -08:00
Andy2
492e086311 break the hint into two so goes-away part can be smaller. 2011-03-10 18:34:02 -08:00
Andy2
d56ce42585 hide games-list hint when more than 2 games present, and add text to
that effect so people aren't surprised.
2011-03-10 18:24:27 -08:00
Andy2
d9bb5197d4 Add two new menus to be available only when in trade mode. Hide and
show them and another group depending on whether trading at the time.
To make that work, replace the individual calls made to dis/enable
toolbar buttons with a single jin call that takes a struct full of
booleans and make that struct available in BoardActivity where menus
are hidden/shown.  Remove the individual calls from the jin interface.
2011-03-10 18:13:56 -08:00
Andy2
9dd69015cc say "relay", not "server" 2011-03-07 21:37:56 -08:00
Andy2
133079e200 tweak newbie message for new local game creation 2011-03-07 21:14:47 -08:00
Andy2
0225bf215b change text of add-game buttons to be (says Deb) clearer 2011-03-07 20:47:49 -08:00
Andy2
b2db1a0936 don't call remote player robot 2011-03-07 20:44:31 -08:00
Andy2
5c2d0a064c Better exchange miniwindow text. But more needed after fixing
BoardView code to better format.
2011-03-07 06:41:17 -08:00
Andy2
8c40628916 Support new error message about exchange being disallowed when no selection. 2011-03-07 06:40:11 -08:00
Andy2
a344f26d1b add static boolean that controls whether logging is on (for java).
Add an Application subclass that fetches the value from a preference,
a checkbox setting in advanced prefs, and modify the static when
that's changed at runtime.
2011-02-28 20:07:07 -08:00
Andy2
fe9932b57d remove hint menu. Add sync-with-server item to board and factor code
implementing same in GamesList up into DlgDelegate where it can be
called from both.  Also, make syncing fire off the service just as the
timer does so that results generate Notifications.  Makes it better
for testing if nothing else.
2011-02-27 22:43:09 -08:00
Andy2
86274785dd add newbie-info on turn-changed 2011-02-25 07:13:54 -08:00
Andy2
5e0f12e49d add a confirmation dialog to "undo last", and remove it altogether
from networked games since as currently implemented it can quickly get
them permanently out-of-sync (and cause the jni code to assert.)  Need
to debug this....
2011-02-25 06:54:38 -08:00
Andy2
8b5f4a84f2 tweak strings so relevant part visible. 2011-02-24 17:45:02 -08:00
Andy2
9809864afb move connect-never option to the top where won't be scrolled off
screen initially
2011-02-24 17:44:43 -08:00
Eric House
29b05b83ec Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-02-22 19:56:40 -08:00
Eric House
ab71ac8847 add game name to chat activity title 2011-02-22 19:55:57 -08:00