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

3255 commits

Author SHA1 Message Date
eehouse
2992fd2d1f add connection separator/title; add prompt to Connection dialog 2010-05-08 15:26:47 +00:00
eehouse
741ab275ec Add GAMEID column to DB for later lookup when messages arrive for 
closed games.
 2010-05-08 15:26:18 +00:00
eehouse
a4bc872906 provide different players labels for the three roles 2010-05-08 15:25:54 +00:00
eehouse
c5032b9c4f get rid of whitespace 2010-05-08 15:25:26 +00:00
eehouse
57fe0a6f06 RelativeLayout is broken on 1.5 devices, so add an alternative and use 
it on 1.5.  It might be good enough for the rest too....
 2010-05-08 15:25:13 +00:00
eehouse
3632c27f04 comment out unused (until we have SMS) code 2010-05-08 15:24:45 +00:00
eehouse
7e9be7de11 nuke commented-out dup string 2010-05-08 15:24:26 +00:00
eehouse
f8d4b1fd34 fix NPE: scores array isn't always there 2010-05-08 15:24:13 +00:00
eehouse
b62fcfd5ce improve hint text for Host; call remote players guests where context 
is limited to host's view.
 2010-05-06 12:47:58 +00:00
eehouse
73f441bea9 move user-visible literals into string resource; shame on me :-) 2010-05-06 12:47:46 +00:00
eehouse
2966939a5a add margins and set text color so hint text matches rest of dialog 2010-05-06 12:47:30 +00:00
eehouse
5a42bd54f0 Add prompt to role spinner. Would really like to add hints to each 
element but don't know how to do that yet.
 2010-05-06 12:47:15 +00:00
eehouse
27222fe336 make it a RelativeLayout, and put dict on same line as state 2010-05-06 12:46:55 +00:00
eehouse
4dc69a762e combine dict label and name in one View: I can't get 'em to layout 
side-by-side when a third view's on the same line.
 2010-05-06 12:46:43 +00:00
eehouse
03fedd6cbc remove "State" from state string 2010-05-06 12:46:25 +00:00
eehouse
f03579dd14 break item info into four text areas that can now be positioned to 
look better.
 2010-05-05 04:12:23 +00:00
eehouse
84a98fab4d get rid of carriage returns in strings formerly consed together in one 
text field.
 2010-05-05 04:12:02 +00:00
eehouse
2025e44aee include scores with player names in printed summary 2010-05-05 04:11:50 +00:00
eehouse
8704e275d2 save scores array in summary db, converting to and from string. Still 
need to display them.
 2010-05-05 04:11:32 +00:00
eehouse
671461f4d4 extend getSummary() to include array of current scores; add util to set an object 
field and remove dead code
 2010-05-05 04:11:08 +00:00
eehouse
b6a89fd8c1 inherit from XWListAdapter and so get rid of one-line methods 2010-05-04 12:31:29 +00:00
eehouse
3c7d972d85 specify a layout rather than a simple TextView for game list items, 
step 1 toward better looking list.
 2010-05-04 12:31:14 +00:00
eehouse
e48caca6ac make configure activity default theme like others after finding a 
divider drawable that shows up.
 2010-05-04 12:30:55 +00:00
eehouse
0e60013f59 remove SMS prefs setting 2010-05-04 12:30:39 +00:00
eehouse
964eedf887 get port from preference; don't hardcode 2010-05-01 02:50:25 +00:00
eehouse
fc21139d52 remove onFocusChanged: we won't need it 2010-05-01 02:50:04 +00:00
eehouse
34e6b07da2 use built-in list_selector_background to get appearance of list. Works! 2010-05-01 02:49:46 +00:00
eehouse
60f497d756 first success at showing focus. Just red for now; needs work. 2010-05-01 02:49:35 +00:00
eehouse
3e83f50c84 use strcasecmp rather than strcmp on cookies (room names) to make 
rooms case insensitive.
 2010-05-01 02:49:19 +00:00
eehouse
d143c47aa1 fill new GameSummary fields 2010-05-01 02:49:08 +00:00
eehouse
638ce53661 strings required by new game summary fields 2010-05-01 02:48:57 +00:00
eehouse
4ed87fecb4 add once-per-day date line to logs since they can span weeks now. 2010-05-01 02:48:47 +00:00
eehouse
5052c05390 add new columns to GameSummary db and use for better summary 2010-05-01 02:48:38 +00:00
eehouse
863ef90115 turn off SMS option 2010-05-01 02:48:16 +00:00
eehouse
72587eb023 remove SMS stuff. No point in confusing users before the feature can 
work.
 2010-05-01 02:47:56 +00:00
eehouse
e9f1bbd37d param name change 2010-05-01 02:47:47 +00:00
eehouse
5a2335f64f fix pending score (and timer, I suspect) being drawn at different 
heights depending on what's been drawn before: pull descent out of
Paint after setting text height.
 2010-05-01 02:47:37 +00:00
eehouse
276811069c fix ghosting by tray divider by drawing it 1 pixel shorter at both 
ends.
 2010-05-01 02:47:22 +00:00
eehouse
62c4f7da2d next release will be beta 3 2010-05-01 02:47:05 +00:00
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