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

3316 commits

Author SHA1 Message Date
eehouse
d5d1b04084 set Theme.Light on GameConfig activity again. It doesn't draw 
correctly with the default (black) theme; in particular, the dividers
between players get a layout height of 0.
 2010-04-25 18:13:49 +00:00
eehouse
6d71b7be02 add summaries to PreferenceScreens 2010-04-25 18:13:41 +00:00
eehouse
9d94f557e1 remove vertScrollBoard from java and stub it out in jni since 
preformance is just as good without it.
 2010-04-25 18:13:29 +00:00
eehouse
fa5d80e85f make larger dict the builtin for a better initial experience, at least 
for English speakers.
 2010-04-25 03:39:24 +00:00
eehouse
6bc3408d8e move resources not requiring localization, both strings and string 
arrays, into new file.  Remove arrays.xml since it's now empty.
 2010-04-25 03:39:13 +00:00
eehouse
1dff9d6e33 up version to b2 2010-04-25 03:39:01 +00:00
eehouse
0b98bb518a always do a clean build, meaning touching Android.mk before building 
the jni and removing bin/ and gen/ before building the java code.  I'm
doing this manually because anything less can produce a bad binary
(unless it's a clean checkout) so might as well automate it.
 2010-04-25 03:38:50 +00:00
eehouse
23747f54ec implement vertical scrolling on platform by copying one part of bitmap 
over itself.  It's not noticably faster than letting the common code
simply inval everything, probably because I have to make a copy of the
bitmap to serve as the source.  But I want to check it in to have a
record.
 2010-04-25 03:38:42 +00:00
eehouse
9ced0bb154 Give spinners string arrays as resources rather than via code; remove 
headers from above spinners and instead include header info in text.
May want to revisit this latter change
 2010-04-25 03:38:27 +00:00
eehouse
f2e62f74b5 no subcategory needed for prefs 2010-04-25 03:38:05 +00:00
eehouse
673495985f better titles for activities 2010-04-25 03:37:52 +00:00
eehouse
ac2b1728a9 first use of a style, for section headings 2010-04-25 03:37:44 +00:00
eehouse
6e626b62cf remove unused setting 2010-04-25 03:37:33 +00:00
eehouse
0c1e76acaf use the default white-on-black style for prefs and game config. Not 
sure why I made it different early on.
 2010-04-25 03:37:23 +00:00
eehouse
a513743003 Fix NPE: test before sending obj a message 2010-04-25 03:37:15 +00:00
eehouse
541cfc9925 raise version to b1 and make it a constant so localized strings don't 
have to change each time.
 2010-04-24 15:14:46 +00:00
ehouse
377fc3c87a Fix to compile and work with recent API changes. Still need to have 
font caching in draw code work with the cellHt passed into
draw_boardBegin rather than each cell's height since the latter can
change now.
 2010-04-24 03:56:50 +00:00
ehouse
71110a195d for some reason on wince coords are passed to coordToCell() that are 
above/left of the board firing an assertion.  return false to indicate
not on board but don't assert.
 2010-04-24 03:51:39 +00:00
eehouse
166c1ac779 make coordToCell() more inclusive to match pointOnSomething(), otherwise 
the latter says a point is on the board and the former can't assign it
a row.
 2010-04-23 09:35:15 +00:00
eehouse
04835a09e1 add missing params so compiles 2010-04-23 09:32:14 +00:00
eehouse
a219b4ae37 remove game config activity's menu. It was down to one item and that 
(revert) isn't needed if the confirm logic is working.
 2010-04-23 08:57:39 +00:00
eehouse
bf0fef5947 reverse comparison with nMoves used to decide if change save 
confirmation needed.  Was just plain backwards.  Now e.g. change of
dict on in-progress game gets you reset confirmation dialog on exit.
 2010-04-23 08:56:28 +00:00
eehouse
8ba15776d2 get rid of string for discard menu which is gone 2010-04-23 08:55:39 +00:00
eehouse
c82a412317 implement revert menuitem by just finish()ing without saving. Ideally 
I guess I'd reopen the dialog but this is easier.
 2010-04-23 08:54:53 +00:00
eehouse
f78ff6786a replace menuitem to juggle players with button; place it and add 
player button below player list; remove heading above phonies, adding
"phonies" to each spinner text; add "game settings" heading.  Still
need to find a way to make the headings pop visually.
 2010-04-23 08:54:04 +00:00
eehouse
ccd68bf3ef make SharedPreferences a static ivar rather than look up each time 2010-04-23 08:52:50 +00:00
eehouse
4019c85caf use new default board size pref in CurGameInfo constuctor 2010-04-23 08:51:44 +00:00
eehouse
8d13050917 add board size to list whose value is set as summary. 2010-04-23 08:50:26 +00:00
eehouse
cdbf68de67 add new advanced pref: default board size. 15x15 is default. Isn't 
used yet.
 2010-04-23 08:49:07 +00:00
eehouse
848342ad7a remove string already removed from english version 2010-04-23 08:46:55 +00:00
eehouse
a6bced850e fix getSquareBonus to produce symmetrical board for sizes < 15. 2010-04-23 08:45:18 +00:00
eehouse
84675f9786 remove color tiles from game config and CurGameInfo class: it's a 
global pref and was being ignored.
 2010-04-23 08:43:11 +00:00
eehouse
f08f9ac390 put back smart robot string. 2010-04-23 08:40:22 +00:00
eehouse
baac58c090 add summaries to global prefs; remove "hide values" pref since screen 
is big enough we'll never need it.
 2010-04-23 08:39:24 +00:00
eehouse
e57626ec87 add ability to set text pref summary from its value and do so for the 
four "advanced" prefs.
 2010-04-23 08:38:21 +00:00
eehouse
0ffc5c326f don't pass bitmaps into java draw code since they're no longer used. 2010-04-23 08:37:27 +00:00
eehouse
5d31c18658 copy dict name into dict struct so e.g. Counts and Values works 2010-04-23 08:36:20 +00:00
eehouse
8067e82332 pass dict name into jni along with its bytes 2010-04-23 08:35:38 +00:00
eehouse
ceff1cde8b pass dict name into jni along with its bytes 2010-04-23 08:34:58 +00:00
eehouse
c2c463171c fix dict_splitFaces to work for utf8 -- by calling into existing java 
code.  Fixes multi-device play with Catalan dict.
 2010-04-22 04:56:48 +00:00
eehouse
bb2642f4b6 use new scaling code based on width of text rather than number of 
chars and where it was called from.
 2010-04-22 04:56:37 +00:00
eehouse
94d3f7483c Since we're not using bitmaps any more remove the code to parse and 
convert them.
 2010-04-22 04:56:14 +00:00
eehouse
7003a5cd93 remove dead variable and code 2010-04-21 12:36:25 +00:00
eehouse
f47b61594b use new code to draw tray specials as well. This is much better than 
the old way, and now all the bitmap stuff can go away.
 2010-04-21 12:36:09 +00:00
eehouse
8ba90c9cbb first pass at replacing bitmap drawing of specials with text scaled 
horizontally to fit.  Does a much better job of making the letters
look natural, with the same baseline alignment as everything else.  No
caching is done and performance seems fine.
 2010-04-21 12:35:55 +00:00
eehouse
e1378e91ab test for null ptr when firing runnable not when creating it 2010-04-20 13:31:08 +00:00
eehouse
2d6ddae8ce tell view at create time whether zoom controls are enabled so it draws 
self in the right place.
 2010-04-20 02:40:00 +00:00
eehouse
4eb7f80cca draw board img at very top of screen if zoom controls are enabled so 
that they appear below tray and don't steal events from tray.  There
should be a better way to do this but it's a big improvement.
 2010-04-20 02:39:44 +00:00
eehouse
9f48c4f99b check for null before calling method on object, fixing one NPE seen 
and another expected.
 2010-04-20 02:39:30 +00:00
eehouse
4d3bab67bb make about box text white for contrast. I don't know why this is 
required when opensudoku seems to be doing the same thing and getting
white text without specifying.  More to learn...
 2010-04-20 02:39:16 +00:00
eehouse
f501ccd946 add better missing-param messages 2010-04-20 02:39:06 +00:00
eehouse
56270dbe7e add missing carriage return (assumed by common code) 2010-04-20 02:38:55 +00:00
eehouse
fbe46c1284 pass boolean isUTF8 in from jni, and if false create InputStreamReader 
to decode ISO8859_1 rather than utf-8.  Fixes problem with Ñ in old
Spanish dicts.  Should fix all pre-utf8-format dicts, actually.
 2010-04-20 02:38:42 +00:00
eehouse
25ffcbec88 add another file (which I've scanned before...) 2010-04-20 02:38:20 +00:00
eehouse
1b14cb7dd6 make order in which bonus color prefs are loaded match that in common 
code, fixing bug where two were switched.
 2010-04-17 04:21:24 +00:00
eehouse
f04a60c0ea make background color the last color preference. It's least important. 2010-04-17 04:21:07 +00:00
eehouse
c6c59d57f8 use the new empty/background color 2010-04-17 04:20:36 +00:00
eehouse
70554b869f change string describing color 2010-04-17 04:20:20 +00:00
eehouse
81bdd66250 default background color is white 2010-04-17 04:20:07 +00:00
eehouse
a7c9159b81 fix init of other colors (new was missing) 2010-04-17 04:19:16 +00:00
eehouse
a6a421f550 add preference for empty cell color, which other platforms have. This 
change makes the pref editable and persistent, but doesn't use it to
draw.
 2010-04-17 04:17:49 +00:00
eehouse
9a98c56b2b latest from translator 2010-04-17 04:17:26 +00:00
eehouse
7827fab1d3 log the various lifecycle methods, including onStop and onDestroy that 
are now overridden only for for logging
 2010-04-17 04:17:12 +00:00
eehouse
348f3cfef3 up alpha version 2010-04-17 04:16:57 +00:00
eehouse
d247ef6ccd tell view about zoom preference every time focus is gained. This 
fixes problems where doesn't have right setting after orientation
change.
 2010-04-17 04:16:45 +00:00
eehouse
a07cdd8513 limit depth of zoom further 2010-04-17 04:16:17 +00:00
eehouse
afcf669be3 only update volkeys pref after pref window's gone away rather than on 
every focus gain.
 2010-04-17 04:15:57 +00:00
eehouse
98d4da136e don't pass null CommonPrefs instance to jni. Fixes crash when closing 
prefs window that was on top of board.
05d8b4c383a5520ce1e0691f25e3af89f69b7cf5 introduced this change by
switching to making multiple calls to unload game.
 2010-04-17 04:15:36 +00:00
eehouse
d1e8b95843 add assert that would have helped 2010-04-17 04:15:20 +00:00
eehouse
d66e74a301 turn off logging for release 2010-04-15 03:35:33 +00:00
eehouse
95ddf7ddd4 add preference controlling whether volume keys or a 
ZoomButtonsController is used to support zooming.  Default is the more
discoverable ZoomButtonsController.
 2010-04-15 03:34:03 +00:00
eehouse
a9a4a99243 reset dims on start to force relayout and init of board rect in common 
code: scroll changes there require init after load since board dims
aren't part of what's saved.
 2010-04-15 02:17:12 +00:00
eehouse
3da04d092d move constant 2010-04-15 02:16:59 +00:00
eehouse
ad2c725a58 always install scrollbar because zooming can require it after the 
fact.
 2010-04-15 02:16:40 +00:00
eehouse
7a5b2e10c3 changes, previously committed, to take advantage of new zoom API: hook 
up to volume key and to ZoomButtonsController, pass from UI thread to
JNI thread and back, dis/enable buttons based on zoomability, and
remove zoom submenu.
 2010-04-15 02:16:30 +00:00
eehouse
7f7af21ff4 make 2nd player robot by default (previously committed) 2010-04-15 02:16:06 +00:00
eehouse
da2cfa5934 changes (commited earlier but now somehow missing) putting 
scroll-related fields into a struct so vertical and horizontal can be
handled by the same code; add to board_zoom out params indicating
whether further zooming is possible.
 2010-04-15 02:15:50 +00:00
eehouse
477899e6aa add debug-only source file 2010-04-13 03:22:08 +00:00
eehouse
43d53bceb8 fix compile command 2010-04-08 04:19:51 +00:00
eehouse
0d7b074b72 minimal changes to get zoomin/out working, which they do. But board 
coords are off and probably other fixup is needed.
 2010-04-08 04:16:16 +00:00
eehouse
805ac26d09 add zoomin/zoomout menuitems. These should become a zoomwindow later. 2010-04-08 04:15:48 +00:00
eehouse
339fc5a9e6 don't zoom down below two cells so we can still drag-scroll 2010-04-08 04:15:33 +00:00
eehouse
41b29c9ba3 distribute extra pixels evenly, with extras one each at the beginning 
of the arrays.
 2010-04-08 04:15:25 +00:00
eehouse
d01a30d1be adjust yOffset same as x so we zoom in toward center; reduce xOffset 
when zoom out makes it too big.
 2010-04-08 04:15:16 +00:00
eehouse
1950e38bda remove bogus assert and logging 2010-04-08 04:15:08 +00:00
eehouse
a87ecf5638 pass vScale and hScale into draw_boardBegin so platform can use same 
size font for all cells regardless of size; fix scrolling to pass
actual sum of the disappearing rows' heights.
 2010-04-08 04:14:55 +00:00
eehouse
5922d8c96a fix coordToCell to return false when cell off board -- to fix bug 
where blank tiles were drawn on top of tray area when scrolled down
there.
 2010-04-08 04:14:42 +00:00
eehouse
774d3f8a13 copyright change 2010-04-08 04:14:34 +00:00
eehouse
b1ed0200cc stretch rows to fill space given by platform: they don't have to be square. 2010-04-08 04:14:22 +00:00
eehouse
d263b47a56 lots of changes, still rough, to allow zooming in and out on board. 
Includes ability to scroll horizontally by dragging.  Board init API
changes to specify board width and max height instead of cell
dimensions, so now board owns task of picking cell size.  If the
number of cells does not evenly divide into a board dimension then the
extra pixels are distributed among some columns/rows in a way that
still allows bitblit-based scroll implementations (though horizontal
scrolling at this point always does an invalAll()).  Not yet tested
with overlapping tray.  And still need to allow rows to be taller than
cols are wide if platform code has given the space.  Stream format
changes with this checkin.
 2010-04-08 04:14:14 +00:00
eehouse
6bd818a10f set drag threshold to 1; 3 is just wrong on android 2010-04-08 04:13:59 +00:00
eehouse
bf0f217460 fix confirm-changes-that-lose-turns logic so doesn't require 
confirmation if no moves yet made.
 2010-04-08 04:13:41 +00:00
eehouse
1deda80a9c add ok/cancel to relay/sms config dialog 2010-04-08 04:13:23 +00:00
eehouse
f1f5b63a0d put ok/cancel buttons back on player edit dialog. Just feels better 
that way.
 2010-04-08 04:12:51 +00:00
eehouse
ea07f92b28 don't show remaining tiles when <= 0 2010-04-08 04:12:26 +00:00
eehouse
97569ae6d0 add advanced pref to hold dict download url; use it. 2010-04-08 04:12:08 +00:00
eehouse
27f65ba39d open connection to relay in the network thread, not in UI thread. It 
can block for a while.
 2010-04-08 04:11:39 +00:00
eehouse
cbb7f5ff4f move game shutdown into onPause and startup from onCreate to onStart 
and onResume so that state's been saved by the time GamesList gets
focus again and wants to display it.  This requires that startup be
ingnored when game's already loaded and that some code test for null
game ptr before acting.
 2010-04-08 04:11:15 +00:00
eehouse
af0c088464 close cursor to avoid exceptions in finalize 2010-04-08 04:10:42 +00:00
eehouse
df473199f9 fix sql syntax error 2010-04-08 04:10:10 +00:00
eehouse
812262e41d add basic framework to collect metadata prior to saving open game 
(e.g. number of moves) and display it in game list.  What to save and
how to display it still not finalized but it works.
 2010-04-08 04:09:50 +00:00
eehouse
aa8b6ac7e6 get rid of warning-generating copyright symbol 2010-04-08 04:09:11 +00:00
ehouse
daa84bf4e2 include date in output 2010-03-31 02:46:29 +00:00
eehouse
2d740bd4b0 remove unused file 2010-03-28 23:39:10 +00:00
eehouse
b07808e8db add copyright notice; turn logging back on for jni code 2010-03-28 23:38:53 +00:00
eehouse
4de143ca10 turn off logging for release 2010-03-28 16:09:55 +00:00
eehouse
ec96b0dd0d start comms after giving CommsTransport a handler for any network 
activity.  This might fix a very rare race condition.
 2010-03-28 16:09:46 +00:00
eehouse
9b955ae770 resendAll on REconnect as well as connect since it doesn't otherwise 
seem to get done.
 2010-03-28 16:09:34 +00:00
eehouse
47f74ceef7 copy improvements from trunk, then fix to deal with missing dict and 
use new -o flag.
 2010-03-28 16:09:27 +00:00
eehouse
6325c3dc63 remove old comment 2010-03-28 16:09:19 +00:00
eehouse
f4b64fe97d add option, off by default, to stall each message forward by some time 
to better simulate network conditions when testing against local relay.
 2010-03-28 16:09:07 +00:00
eehouse
603462fc33 add option to skip modal dialog showing final game score (may prevent 
curses version from becoming nonresponsive when used from playme.sh);
add menu command to curses version to resend messages.
 2010-03-28 16:08:54 +00:00
eehouse
13b46297e0 Separate life of socket from that of selector: close socket if must 
but don't exit the thread and be ready to reopen.  Fixes bug where
wouldn't reconnect to relay if died and then came back.
 2010-03-25 04:53:44 +00:00
eehouse
cb5cc975b3 add new params required for comms_getInitialAddr 2010-03-25 04:53:16 +00:00
eehouse
f71430dc27 better logging of outgoing sms -- which still doesn't work in emulator 
after new tools released.
 2010-03-25 04:52:58 +00:00
eehouse
f430a84d75 add comms_transportFailed, and call when relay goes down. This makes 
icon change correctly and comms start trying to reconnect, but the
loop in CommsTransport can't be restarted yet.
 2010-03-25 04:51:55 +00:00
eehouse
55abf1116b get relay port from prefs and pass into jni 2010-03-25 04:50:19 +00:00
eehouse
077bc53e80 go back to having Ok and Cancel buttons: that's the way the built-in 
prefs editors work.  Dismiss == Cancel, again following the built-in.
 2010-03-25 04:48:03 +00:00
eehouse
02a96cdaa6 remove ability to edit host and port when configuring relay. Must use 
prefs/advanced.
 2010-03-21 03:13:16 +00:00
eehouse
786541e9ae pass default hostname in from platform code rather than compiling it 
into jni; in java pull it from preferences and pass into jni.
 2010-03-21 03:12:58 +00:00
eehouse
a32975362a increase text of color labels -- but they should really be white. 2010-03-21 03:12:38 +00:00
eehouse
815ac74ebe change color prefs key names so won't crash opening older db 2010-03-21 03:12:28 +00:00
eehouse
19f6ec62db add a color sample above the RGB sliders so changes appear in real 
time.
 2010-03-21 03:12:17 +00:00
eehouse
d68038b18b Remove ok button from color editor; when cancel chosen don't save changes. 2010-03-21 03:12:02 +00:00
eehouse
9466203844 use sliders instead of text fields for editing of colors, and store 
them as ints.  This will probably cause older versions to crash.  Need
either to change the names of keys or warn with next release.
 2010-03-21 03:11:49 +00:00
eehouse
b20296fbd2 First cut at a color prefs editor. 2010-03-21 03:11:29 +00:00
eehouse
e05b31585d get rid of logging 2010-03-21 03:11:09 +00:00
eehouse
a5c3fa5f59 don't pass empty stream to comms_send: this fixes a problem where 
client code calls server_initClientConnection when the game's already
been started and empty messages get queued up.  Ideally the call
wouldn't happen but I'm not sure how to test if a game's begun.
server's doing the right thing not putting anything in the message.
 2010-03-21 03:10:56 +00:00
eehouse
5806aa0aca get rid of excess logging 2010-03-21 03:10:47 +00:00
eehouse
0b7eee672a do something for -S on curses version too 2010-03-21 03:10:36 +00:00
eehouse
b3a4ac306e actually do something (on the gtk side at least) when -S param is 
passed.
 2010-03-21 03:10:29 +00:00
eehouse
76926abdbf get rid of "ignored" since passwd no longer is 2010-03-21 03:10:20 +00:00
eehouse
b6aaf6c38c in debug builds track who sets env so we can log who has it on 
conflict rather than just assert.
 2010-03-21 03:10:10 +00:00
eehouse
62b586d322 close down jni thread before saving game to fix occasional assertion 
fail occuring when draw and save were in the jni at the same time.
 2010-03-21 03:10:00 +00:00
eehouse
5f6c8fd579 support passwords: save 'em when configuring player, and implement 
askPassword in jni and java code.
 2010-03-21 03:09:47 +00:00
eehouse
4633bc506b turn logging back on 2010-03-21 03:09:23 +00:00
eehouse
e2ad027740 ready for next release: remove Hex dict and turn off logging 2010-03-14 16:32:54 +00:00
eehouse
05f7da8c33 ignore more 2010-03-14 16:25:27 +00:00
eehouse
0943c24669 what I meant to check in: remove log message and commented code 2010-03-14 16:25:18 +00:00
eehouse
c293425d2e When cell background changes to show focus draw cell chars in normal 
color rather than white.
 2010-03-14 16:25:06 +00:00
eehouse
f28f5b80d3 include name of dict being downloaded in download progress dialog 2010-03-14 16:24:54 +00:00
eehouse
f5f54f53f4 increase size of miniwindow text and move linebreak in trading text so 
still fits at larger size.
 2010-03-14 16:24:37 +00:00
eehouse
77373765f8 get rid of strings that don't need localization 2010-03-14 16:24:22 +00:00
eehouse
6a3661d30e use XWListAdapter to get rid of duplicate methods 2010-03-14 05:02:08 +00:00
eehouse
7fadce15ef add menuitem to main games list view that brings up view of all 
installed dicts.  Currently allows to delete them.  Later should allow
invoking a browser like DawgShow.
 2010-03-14 05:01:55 +00:00
eehouse
626a7e4a32 rename list item class/layout to indicate more generic use 2010-03-14 05:01:33 +00:00
eehouse
78fb9e0092 new class that implements those functions in ListAdapter that are 
always the same or depend on a single count variable.
 2010-03-14 05:01:13 +00:00
eehouse
cd2fc9b49a don't try to work on games whose dicts are missing (though users can't 
actually delete them yet): check in GamesList, and put up alert via which
they can launch the download activity.
 2010-03-13 23:11:57 +00:00
eehouse
0f620305f0 refactor to rebuild dict list onResume() to pick up any downloaded dicts. 2010-03-13 23:11:35 +00:00
eehouse
6eb045d3a8 don't crash if exiting without having successfully opened a game. 2010-03-13 23:11:23 +00:00
eehouse
0fc42fe85c get rid of unused DictActivity 2010-03-13 23:11:11 +00:00
eehouse
5ef7697c05 download dicts under app control (with new activity) and save them 
locally rather than leave them in the browser's downloads directory.
Fix code that expects all files in local storage to be games (since
dicts are now there too.)
 2010-03-13 23:10:58 +00:00
eehouse
6e77904d56 layout for dict download progress and string to populate 2010-03-13 23:10:42 +00:00
eehouse
2761772e05 When user dismisses GameConfig form, check if the game being viewed 
has any state (moves) and if the changes being made would invalidate
that state and force a reset.  If so, give the user a choice between
save and discard.  Means CurGameInfo behaves slightly differently if a
game is in progress.  Also fix game reset to preserve comms address.
 2010-03-13 23:10:30 +00:00
eehouse
11d6f7417e when copying strings between structs, realloc, don't just copy ptrs. 2010-03-13 23:10:11 +00:00
eehouse
ef15f50edf add model_getNMoves 2010-03-13 23:09:53 +00:00
eehouse
eab9eed137 rm unused .xml file 2010-03-09 06:30:08 +00:00
eehouse
846f07e929 get rid of save button in comms config dialog 2010-03-09 06:29:49 +00:00
eehouse
a727c3bb2b get rid of tmp font-flags config preference 2010-03-09 06:29:31 +00:00
eehouse
dfb33c33b4 change about toast into about alert, in Utils so callable from two 
locations.  Url and mailto ref may not work yet.  Needs contrast of
text with background fixed.
 2010-03-09 06:29:04 +00:00
eehouse
fd423f7704 treat enter key same as center; improves testing with emulator if 
nothing else.
 2010-03-09 06:28:42 +00:00
eehouse
04e454f922 add relay status icon 2010-03-08 06:16:08 +00:00
eehouse
e73c6d1234 pass relayStatus an enum rather than an int 2010-03-08 06:15:37 +00:00
eehouse
285e1b47d5 get rid of save button: dismiss to save. 2010-03-08 06:15:14 +00:00
eehouse
4bbda7ad6e new strings for force-remote dialog 2010-03-08 06:14:58 +00:00
eehouse
5140b95766 new dialog to force user to pick remote players after making game be 
host; call new CurGameInfo methods to ensure gi is kosher before it's
passed to jni code (which asserts if it's not).
 2010-03-08 06:14:44 +00:00
eehouse
f50a25ef3f move creation of summary string into CurGameInfo 2010-03-08 06:14:28 +00:00
eehouse
9beada3c4c add logic to show different names, even change values if needed, to be 
consistent with rules based on the device role, e.g. that a guest has
no remove players and a host has at least one.
 2010-03-08 06:14:00 +00:00
eehouse
dd002cf60f custom view for dialog to list players in checkboxes and require that 
one be make remote
 2010-03-08 06:13:36 +00:00
eehouse
2741c0067e increase size of player list item view in game config -- looks more 
like a real list now.
 2010-03-08 06:13:19 +00:00
eehouse
5d42cebca1 change compile command 2010-03-08 06:13:06 +00:00
eehouse
0be2096f9c report UnresolvedAddressException, which I've seen 2010-03-08 06:12:44 +00:00
eehouse
257addec99 divider to insert between players 2010-03-08 06:12:21 +00:00
eehouse
47387990e9 represent mid-drag tiles on the board as pending -- usually drawn 
inverted by platforms -- since that's how they'll look once they drop.
Inverted color is easier to follow too.
 2010-03-08 06:12:01 +00:00
eehouse
3b94642e3d don't consider specials that are blanks to be bitmap-backed tiles. 
This prevents the board from passing an array of empty bitmaps into
draw code which in turn allows platform code to be less defensive.
 2010-03-08 06:11:42 +00:00
eehouse
08d5139631 translate blank text from '_' to '?' 2010-03-08 06:11:30 +00:00
eehouse
6e08bbc9ce don't draw tile that's the source of a drag. 2010-03-08 06:11:18 +00:00
eehouse
00e8742ad8 show blank as a ? rather than a _. 2010-03-08 06:10:46 +00:00
eehouse
ec24df8546 include any mid-drag tile, if it's a blank, in the set of blank tiles 
rendered in the second pass.  Mid-drag tiles were not being rendered
if they happened to be blanks.
 2010-03-08 06:10:37 +00:00
eehouse
815a5f85b0 core files happen 2010-03-08 06:10:02 +00:00
eehouse
6bb1170ca8 minor bugs with tray focus: player color not used for pending score; 
pending score doesn't show focus; focussed empty tile slots drawn with
bogus value.
 2010-03-08 06:09:40 +00:00
eehouse
0a34c2512c turn logging back on 2010-03-08 06:08:46 +00:00
eehouse
bc3f6c2c30 turn off debugging for release 2010-02-28 18:19:47 +00:00
eehouse
f896e86693 work around svnversion not working inside git-managed tree 2010-02-28 18:17:35 +00:00
eehouse
5fc86dbe3a 0 means transparent 2010-02-28 16:56:27 +00:00
eehouse
0fa5f5fcd5 improve bitmap generation: only foreground needs to change; background 
can always be transparent.
 2010-02-28 16:55:56 +00:00
eehouse
cd85406c01 create and cache new bitmaps from black-on-transparent originals 
provided from dict based on player color and whether inverted.  This
works around apparent lack of API to change colors of monochrome
bitmaps at draw time (paralleling those for drawing text.)
 2010-02-28 16:54:59 +00:00
eehouse
4e2ebebcfd notify BoardView when prefs change 2010-02-28 16:54:22 +00:00
eehouse
da46fe3163 just draw the bitmap in the largest rect possible. 2010-02-28 16:54:06 +00:00
eehouse
36fd71bde8 use fillRect instead of two lines 2010-02-28 16:53:48 +00:00
eehouse
b4f40627ae fix warnings flagged by Eclipse 2010-02-27 20:22:04 +00:00
eehouse
99847cd0c5 remove noop function 2010-02-27 20:06:45 +00:00
eehouse
a067da05db when IS_CURSOR flag is set, use draw using background from prefs. 2010-02-27 18:06:06 +00:00
eehouse
f0840f1e8d implement focus keys capture and jni interaction. Some hackishness 
required due to inconsistency in ordering of key events,
e.g. sometimes up not preceeded by down.
 2010-02-27 18:05:54 +00:00
eehouse
cb6b19f0aa implement board_getFocusOwner, board_focusChanged and board_handleKey, 
and utils needed.
 2010-02-27 18:05:39 +00:00
eehouse
397d0df573 turn on PERIMETER_FOCUS 2010-02-27 18:05:29 +00:00
eehouse
856b957f6a another file to search 2010-02-27 18:05:21 +00:00
eehouse
671876fc06 fix varargs version of logf 2010-02-27 18:05:12 +00:00
eehouse
47402bd3b5 remove unused field 2010-02-27 18:05:00 +00:00
eehouse
26d4056a76 add timestamp to java logs 2010-02-27 18:04:52 +00:00
eehouse
b6a151a7e8 don't adjust y upward if divider's being dragged -- should be tiles 
only.  Fixes bug where divider can't be dragged unless grabbed low or
started quickly.
 2010-02-27 18:04:40 +00:00
eehouse
7d0bd9d50c implement mini window, jni and java rendering. Works on emulator, but 
may not work as well under fat fingers....
 2010-02-27 18:04:33 +00:00
eehouse
a18470e4a2 add and implement reset menuitem 2010-02-27 18:04:11 +00:00
eehouse
4b48c1a0e6 set draw after ending game so scoreboard will update 2010-02-27 18:03:51 +00:00
eehouse
28edaa09e2 fix missing import (oops) and cleanup final scores stuff. 2010-02-27 18:03:36 +00:00
eehouse
6d1c09e756 fix compile errors introduced by addition of const 2010-02-27 18:03:22 +00:00
eehouse
b52c9f0d14 Fixes bug found by alpha tester by dragging third tile to left of 
divider.  Inval all tiles when a drag ends off any managed space.  We
don't know what tiles have already been moved, and when it's returned
to its initial spot may appear a dup.
 2010-02-27 18:03:15 +00:00
eehouse
cf9c952fc2 handle final scores menuitem: add server_endGame to jni and new 
dialog/mechanism to call back and forth between threads to query and
end game on positive response.
 2010-02-27 18:03:07 +00:00
eehouse
142492ad85 get rid of game info menuitem and strings 2010-02-25 04:52:11 +00:00
eehouse
6fa6162a39 improve choice of font size for cells and tiles: calculate once based 
on a reasonable size, then figure multipliers (floats) to be used to
calculate the size and descent for font selection and positioning
relative to baseline.  Seems to work for dicts with and without
descending chars and with and without diacriticals.  Untested for
dicts with bitmaps (e.g. Catalan.)
 2010-02-25 04:51:35 +00:00
eehouse
3e8d4220f5 hide .apk file 2010-02-25 04:51:16 +00:00
eehouse
8c9b710e61 fix old typo: colors should be different 2010-02-25 04:51:06 +00:00
eehouse
c2ff34eeaa fix compile errors due to conflicts with default 2010-02-24 14:20:09 +00:00
eehouse
ce03b01491 new from translator 2010-02-24 05:21:55 +00:00
eehouse
eb3d0308e0 add const 2010-02-24 04:34:22 +00:00
eehouse
e5f3384050 another .gitignore 2010-02-24 04:30:21 +00:00
eehouse
210332ec93 implement and call comms_resendAll 2010-02-24 04:30:13 +00:00
eehouse
2d22ef1f6a hide more files/dirs 2010-02-24 04:29:54 +00:00
eehouse
8de2665642 implement phonies: add jni->java for util_warnIllegalWord, jni changes 
to preserve the field in CurGameInfo, and java changes to keep
correct text in reused dialogs.
 2010-02-24 04:29:46 +00:00
eehouse
3fd42f8510 temporarily add options to prefs to choose flags passed to Paint for 
drawing text
 2010-02-24 04:29:28 +00:00
eehouse
3ca7f84659 temporarily add options to prefs to choose flags passed to Paint for 
drawing text; improve calc of textHeight to better fill cell.  Still
need to detect dicts where descent isn't used, e.g. hex
 2010-02-24 04:29:17 +00:00
eehouse
8b84bdf56e Once user has rejected a bad word, don't ask about any later ones as 
the whole turn's being rejected.  Should be merged to trunk.
 2010-02-24 04:29:00 +00:00
eehouse
3d26d9fc01 name of file has changed 2010-02-24 04:28:52 +00:00
eehouse
414ee944af turn logging back on 2010-02-24 04:28:44 +00:00
eehouse
ae63c16473 add some .gitignore files 2010-02-24 04:28:34 +00:00
eehouse
6e9fb31f60 fix compile errors due to making some fields const 2010-02-24 04:28:22 +00:00
eehouse
c6e9cb36d0 add .gitignore 2010-02-23 06:05:56 +00:00
eehouse
071edd8121 turn logging off for release 2010-02-21 22:02:55 +00:00
eehouse
c7a0ebb830 cleanup: cache Paint used to draw bitmap, etc. 2010-02-21 21:42:23 +00:00
eehouse
2498e86a38 lock orientation at current setting before bringing up blocking 
dialog; unlock on dismissing it.  The solves problem of how to draw
background board when orientation changes and jni thread is blocked.
 2010-02-21 21:41:21 +00:00
eehouse
fe8e49bce2 Forgot to add this yesterday: interface for jni thread to use to shift 
drawing into BoardView where it can be synchronized.
 2010-02-21 04:58:04 +00:00
eehouse
93ad1f3b30 get rid of BlockingActivity, using instead dialogs inside 
BoardActivity.  Block jni thread after it posts to the UI thread to
put up the dialog, and in a dismiss listener on the dialog release the
blocked thread.  Seems to work.
 2010-02-21 04:56:37 +00:00
eehouse
cbbf30d0b7 synchronize access to the bitmap and owning canvas used first by 
jni-sourced drawing and then by doDraw to put the bits on the screen.
This should fix crashes when screen orientation changes while
board_draw is running in the JNI thread, but for some reason the
emulators aren't signaling config changes so I can't test.
 2010-02-20 19:19:45 +00:00
eehouse
de58f33b4c add game time to board and jni; clean up hide/show on check events. 2010-02-18 04:44:30 +00:00
eehouse
74140ccaad remove duplicated code 2010-02-18 04:42:22 +00:00
eehouse
5cf9472642 translate error codes into alerts or toasts where appropriate. 2010-02-17 15:10:10 +00:00
eehouse
1e253c0210 turn logging back on 2010-02-17 14:38:11 +00:00
eehouse
cd0afbfae8 Create and pass enum into relayErrorProc 2010-02-17 14:37:53 +00:00
eehouse
135d936a7d Fix warnings that appear when logging off. 2010-02-15 02:54:10 +00:00
eehouse
928f65a266 turn off logging for release 2010-02-15 02:49:16 +00:00
eehouse
84fa9bce88 Fix problems detecting orientation change: instead of passing a 
message, have draw check if dimensions are same as when did layout and
redo them if they're changed.  Works because the OS wants us to redraw
as soon as orientation changes.  But this makes it easier to hit a
synchronization problem: if re-layout happens mid-draw then canvas or
other draw-related objects may be null.  Need to get rid of the jni
thread OR synchronization drawing and layout.
 2010-02-15 02:48:27 +00:00
eehouse
996351cc9c minor changes: rearrange menus, new strings, etc. 2010-02-14 22:05:08 +00:00
eehouse
919c7be9d6 set gameID when saving CurGameInfo from java IFF it isn't already set. 2010-02-14 22:01:06 +00:00
eehouse
84ebc38882 copy gameID as part of CurGameInfo 2010-02-14 17:38:40 +00:00
eehouse
10cf2894b8 Don't assert comms type not NONE when copying 2010-02-14 17:37:56 +00:00
eehouse
0396041864 search TransportProcs too 2010-02-14 17:29:07 +00:00
eehouse
65fb05b29c Export remaining prefs colors; add default relay host to prefs. 2010-02-14 17:28:46 +00:00
eehouse
5e066514cb Pare from connection options transports not supported on device. 1.5 
will be relay only.  1.6 adds SMS, and 2.0 Bluetooth.
 2010-02-14 17:27:27 +00:00
eehouse
885c9093fb Put up Toast messages on connecting to relay. 2010-02-14 17:23:07 +00:00
eehouse
7d385e180a Don't erase bottom of board drawing tiles; figure font size based on 
chars in dict (untested); get background color from prefs; etc.
 2010-02-14 17:21:59 +00:00