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

613 commits

Author SHA1 Message Date
Andy2
5acc2205be add pref to edit color used to draw bonus hints on cells 2011-08-25 18:13:42 -07:00
eehouse@eehouse.org
147687890f Merge branch 'android_branch' into send_in_background 2011-08-24 06:52:51 -07:00
Andy2
3537161d3b add change 2011-08-22 18:40:30 -07:00
Andy2
7e6daa5797 move role out of players column to where it can be a full line long, 
preventing it from increasing the size of the item by line-wrapping.
For now it's outside the View that gets hidden, but that may need to
change.
 2011-08-22 07:05:33 -07:00
Andy2
d7a515ca97 display three states of relay connectedness in games list items: 
configured, connected but waiting for players, and game-in-play.
 2011-08-22 07:03:46 -07:00
Andy2
1ee0dfdd6d set wordlist spinner prompt and include language 2011-08-21 22:13:18 -07:00
Eric House
cf6d868bd3 use separate strings for window title and spinner prompt 2011-08-21 18:17:21 -07:00
eehouse@eehouse.org
3cdd4c1c9b Merge branch 'android_branch' into send_in_background 2011-08-21 15:04:25 -07:00
Andy2
aeafb9cefa Tweak language for moving wordlists to more clearly refer to storage 
locations.
 2011-08-21 15:03:41 -07:00
Andy2
d1b6bc16cf add the standalone/network icons from GamesList display to the new 
games dialog so users get some association going.
 2011-08-21 14:30:00 -07:00
Andy2
04834c910b more dictionary->wordlist terminology change: debug-only preference 
and download URL.
 2011-08-21 14:27:50 -07:00
Andy2
a17ff20db7 clean up background check pref wording to Chris's suggestions 2011-08-21 13:52:51 -07:00
eehouse@eehouse.org
d7d5d85ec2 Merge branch 'android_branch' into send_in_background 2011-08-21 12:20:25 -07:00
Andy2
5c8afa06ce version string and changelog for beta 33 2011-08-21 12:07:45 -07:00
Andy2
c38e3593fb replace hard-coded placeholder names for optional top-line of games 
list item display with real "aa vs. bb vs..." consed up in
GameSummary, and set field to singleline so doesn't wrap when names
get too long.
 2011-08-21 11:39:38 -07:00
Andy2
28c78a0a6a dictionary->wordlist 2011-08-20 14:16:38 -07:00
Andy2
eb00984563 Merge branch 'android_branch' into send_in_background 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
 2011-08-20 12:44:17 -07:00
Andy2
fd4e627628 when sd card is umounted, android sends a message to apps. I can't 
figure out how to get that so I ignore it and am killed then
relaunched if I have a dict file open on the SD.  On relauch, don't
crash.  Instead, check if any dicts used by the game is unreachable
and put up an alert with only one choice: Close game.  Thought about
using the missing-dicts stuff from GamesList, but this is a special
case that should be seen only when user umounts while a BoardActivity
instance is frontmost.
 2011-08-18 07:54:00 -07:00
Andy2
455cb9a4c4 Include possibility of umounted sd card in missing dict 
explanation. Name of game too.  Use single-selectable list and
Substitute button instead of expecting user to tap once to select
(which confused me.)
 2011-08-18 06:26:43 -07:00
Andy2
11f6d96be9 get 'svn' out of the version string variable 2011-08-16 19:26:53 -07:00
Andy2
e2ef25ae90 add pref for choosing what goes in parens along with the game name 
(where <language> was before.)  opponent name still needs to not be
hard-coded; the rest works.
 2011-08-09 19:26:59 -07:00
Andy2
ceb2d1ac63 fix indenting -- white space only. 2011-08-09 06:48:10 -07:00
Andy2
ab64d57f5c adapt a couple of icons as placeholders for standalone and networked 
games.  Every games-list item now has an icon.  The networked game
icon is replaced by the sync icon when there's new information.
 2011-08-08 18:56:19 -07:00
Andy2
d08eacc4c0 comment: reminder of possible icon for archiving 2011-08-08 18:53:58 -07:00
Andy2
f8715feea6 update version and changelog for b32 2011-08-06 23:08:42 -07:00
Andy2
011b283566 tweak copy dialog to suggest using new-from. 2011-08-06 16:18:32 -07:00
Andy2
719fd314a5 move net msg icon outside of hideable part of game list item layout so 
it remains visible when not expanded.  Otherwise people won't see that
something happened to a closed game.
 2011-08-06 16:03:38 -07:00
Andy2
6cde6be6a5 up version and changelog for beta 31 2011-08-06 14:29:58 -07:00
Andy2
35a5aad477 make name text larger -- button is anyway. 2011-08-06 13:19:48 -07:00
Andy2
d7dfb89f65 query user before sending invite whether to use html or text and 
format differently depending on the answer.  With html only I couldn't
invite using SMS, which bites.
 2011-08-06 13:01:40 -07:00
Andy2
560208f516 roll my own expandable list items. (The stupid built-in ones don't 
allow any control over whether the initial state is expanded.)
Getting click to work is a bit of a hack, requiring a callback from
the adapter back to the activity, but it works well on emulator.  Need
to test on device then try to shrink the ImageButton.
 2011-08-06 11:29:41 -07:00
Andy2
58f1618586 put oft-used menuitems up higher 2011-08-06 03:19:59 -07:00
Andy2
9c298a16e7 The email apps won't display non-http schemes as clickable links, so 
go with html and encode both the invite and install links as php refs
that get redirected.  Works, but eliminates SMS as sending mechanism.
 2011-08-06 02:57:14 -07:00
Andy2
e8b66e230c add title to context menu that includes game name 2011-08-04 18:16:32 -07:00
Andy2
9aeb8858fe add menuitem and dialog it triggers to rename games. Add new DB field 
to hold game name, and getter and setter.  Replace existing gameName()
method with call to new getter.
 2011-08-03 18:59:32 -07:00
Andy2
3563ca5855 finish changes list 2011-07-22 10:54:06 -07:00
Andy2
1f89eb0238 start on changes list 2011-07-19 18:37:23 -07:00
Andy2
ea853e2e51 replace hard-coded list of preferences whose summaries are their 
values and code to enforce that with custom subclasses that do the
right thing automatically.
 2011-07-19 18:21:52 -07:00
Eric House
febb640049 add name of remote player to notification that remote player moved. 
And remove a few dead strings.
 2011-07-15 18:13:55 -07:00
Andy2
9bed15179d version update -- getting ready for next beta! 2011-07-14 18:53:45 -07:00
Andy2
b1f14972e0 remove commented-out foo 2011-07-14 18:53:22 -07:00
Andy2
8c36727578 tweak new-game dialog strings. 2011-07-08 18:45:41 -07:00
Andy2
0c4191805f Merge branch 'android_branch' into android_invite 
Conflicts:
	xwords4/android/XWords4/res/values/common_rsrc.xml
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CurGameInfo.java
	xwords4/linux/scripts/discon_ok2.sh
 2011-07-07 18:50:22 -07:00
Andy2
7376161dd5 change screen-on preference to a 10-minute interval rather than 
forever.  Should be long enough to allow a move without risking
battery death.
 2011-07-07 06:41:44 -07:00
Andy2
23831a1910 forgot a change 2011-07-07 06:27:28 -07:00
Andy2
3ccc323465 update version and change info for next beta 2011-07-06 19:00:06 -07:00
Andy2
7fa86f8007 tweak summary 2011-07-06 18:59:47 -07:00
Andy2
ebdf4cce87 add new preference to keep the screen on when the board's visible (per 
request).  Off by default, of course.
 2011-07-06 18:50:11 -07:00
Andy2
ae0860a047 add a newbie-info for new-from menuitem. Still need one for reset. 2011-07-06 18:24:46 -07:00
Andy2
546791d215 custom message when more than one player missing reminding to invite 
more than one person.
 2011-06-30 06:30:05 -07:00
Eric House
48ea9e2b28 add preference to juggle players when creating a new game 
Conflicts:

	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CurGameInfo.java
 2011-06-29 21:43:44 -07:00
Andy2
632980dc98 add preference to juggle players when creating a new game 2011-06-29 06:16:58 -07:00
Andy2
413b2f5b2e include default language in text in new game dialog. 2011-06-28 19:01:03 -07:00
Andy2
cb5fa56a90 Tweak a couple of messages. Bye Luke! 2011-06-14 06:40:10 -07:00
Andy2
7a5549cc43 set selectAllOnFocus on player name edit. Can't figure out how to 
force focus to that field though....
 2011-06-14 05:38:37 -07:00
Andy2
d470a1c1e0 add a newbie-info for new-from menuitem. Still need one for reset. 2011-06-13 18:47:42 -07:00
Andy2
a318021308 title that won't surprise on upgrade 2011-06-13 18:26:12 -07:00
Andy2
d18ac741b7 add new debug pref for redirecting host so it and relay can live on 
different machines.
 2011-06-13 18:17:37 -07:00
Andy2
5232186b1d path starts with //, not / 2011-06-13 05:28:06 -07:00
Andy2
dfc8519c9c wrap password query field in layout too so it can have some margins. 2011-06-11 06:06:42 -07:00
Andy2
e9e8211050 capitalize names in player config too 2011-06-11 06:06:03 -07:00
Andy2
6620b42abd clean up new game dialog (thanks K.T.!): remove title bar, add some 
spacing and make it scrollable for when in landscape mode.
 2011-06-10 22:51:54 -07:00
Andy2
8c65ed5548 have default name text selected for easier replacement 2011-06-10 22:28:49 -07:00
Andy2
bb82831fb4 put EditText into a layout so can have some margins. 2011-06-10 20:55:18 -07:00
Andy2
d058e3fd4b use a layout instead of a raw text widgit. 2011-06-10 20:02:14 -07:00
Andy2
1cc2717d50 tweak text for consistency 2011-06-10 20:01:22 -07:00
Andy2
a7851f3c55 on initial startup check if the default name's been set for Player 1. 
If not, give a chance to set it and a welcome message.  Whatever
happens, wind up with some sort of default name so the query isn't
repeated unless user clears all defaults.
 2011-06-10 18:58:49 -07:00
Andy2
1d5cfd49fa remove second URL that was meant to allow user to install Crosswords 
if it's not installed (because SMS apps confuses with the way it
presents multiple URLs.)  Will try to do the same thing with the
redirect .php script whose output will stick around if the redirect
fails.  Also, use URI.Builder instead of a format string to build the
redirect URL.  It's cleaner.  Still need to have a space in the format
string to keep sentence-finishing period from becoming part of the
room name.  Not sure how to fix that without moving to html messages
which I assume don't work in SMS.
 2011-06-10 06:49:32 -07:00
Eric House
dd97a81191 make constant string a static final rather than a resource. 2011-06-09 20:48:06 -07:00
Andy2
e097b15071 room names are user-created and need to be URLEncoded to e.g. escape 
spaces.
 2011-06-09 06:38:43 -07:00
Andy2
cb8e162080 Progress toward getting invites going. Seems to work but is very 
clunky: email and sms both send messages with URLs that work on the
receiving end.
 2011-06-07 18:38:10 -07:00
eehouse@eehouse.org
484bb295d0 Merge branch 'android_branch' into android_invite 2011-06-06 22:08:49 -07:00
Andy2
54777c8dbd catch exception (and put up a explanatory Toast) that occurs, says 
google's crash report site, when I try to launch something to handle
http and nothing can.  Maybe people are installing Crosswords on
devices that don't have browsers.
 2011-06-06 20:40:12 -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
37a2fa0aa1 update release notes 2011-06-06 07:02:16 -07:00
Andy2
056261fe9e up version number/strings 2011-06-06 06:49:47 -07:00
Andy2
f29dff4ff5 add icon for new add-game menuitem 2011-05-26 18:46:29 -07:00
Andy2
3df47f8fe2 separate string for missing player 2011-05-20 06:50:38 -07:00
Andy2
0b2ca44fa9 we need *name and *namef forms 2011-05-19 22:50:39 -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
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
7389b3b4c8 disable the three unused name prefs 2011-05-17 18:26:53 -07:00
Andy2
0763e7d5b3 put the two dictionary settings into their own subscreen -- like 
player names.
 2011-05-17 18:20:21 -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
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
53f1bc8858 fix to use positional params in format strings 2011-05-14 11:44:13 -07:00
Andy2
ba6968c937 remove strings no longer used 2011-05-14 11:29:05 -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
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
e51b6f3322 add dict's locations to display 2011-05-11 18:07:07 -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
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
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
2dbf1ac489 add formatted=false to postpone fix suggested by new version of SDK 2011-05-10 06:27:58 -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
9dfcb2dda2 first step toward using an expandable list for dicts browser, with 
languages as first-level items each containing all of the dictionaries
in that language.  This is a snapshot: it's broken visually and
functionally.
 2011-05-08 22:50:42 -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
4d31c9cbe5 update release notes 2011-05-03 18:55:51 -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
e89c6f94b6 update with changes since b24 2011-04-29 06:39:34 -07:00
Andy2
d49a20867a new default robot dictionary 2011-04-29 06:25:16 -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
e9fadd4d96 Rework list item code to deal with when the summary isn't available: 
have update icon hidden by default, and print the game name (which we
know.)
 2011-04-23 18:19:35 -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
3c0cf176ef show language as part of game name, not dict as separate line 2011-04-11 06:54:31 -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
Eric House
13b5acf8b5 changes log updated 2011-03-31 18:07:02 -07:00
Andy2
58ff3189a0 remove layout and code allowing toolbar to be positioned in landscape 
mode.
 2011-03-12 04:15:57 -08:00
Eric House
9b99183d2c update for b23 2011-03-11 18:06:43 -08:00
Andy2
e7ab1c34b7 add more carriage returns for history formatting 2011-03-11 06:52:43 -08:00
Andy2
a280fe7e3e remove localized format strings identical to that causing crash in English 2011-03-11 06:47:29 -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
26a274ab0f make the empty-list message a header instead since its instructions 
matter after there are games in the list.  But hide it whenever there
are four or more games.
 2011-03-09 18:42:06 -08:00
Andy2
bfc5bb62dc don't call nobody dumb, even a robot. 2011-03-08 21:58:12 -08:00
Andy2
678cbe1dea fix plural and make name consistent 2011-03-08 18:42:45 -08:00
Andy2
15ef9c4fd2 add prompt to dict-pick spinner 2011-03-08 07:31:11 -08:00
Andy2
7de951f149 update with changes from b21 2011-03-08 07:13:14 -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
2fdda2bae1 move game_name to its own row at top so it serves as title. 2011-03-04 07:39:54 -08:00