Eric House
65598cdb7b
replace DeleteLocalRef calls
2012-09-24 07:44:43 -07:00
Eric House
140c982d41
merge from android_branch
2012-09-24 07:39:44 -07:00
Eric House
598a154693
factor common code into function
2012-09-19 08:09:27 -07:00
Eric House
75398389b3
Merge branch 'android_branch' into android_dictdb
...
Conflicts:
xwords4/android/XWords4/jni/jniutlswrapper.c
2012-09-15 16:36:15 -07:00
Eric House
ee1df7eeb7
replace DeleteLocalRef calls with version that checks for NULL
2012-09-15 15:57:38 -07:00
Eric House
937bde6378
combine two jniutils methods into one
2012-09-15 15:21:31 -07:00
Eric House
aa974be567
Before figuring md5sum (via java callback added recently), use new
...
callback to see if there's already one in the DB. Required passing
context into jniutils getter, and passing name into jni dict
constructors that previously didn't need it.
2012-09-13 07:38:08 -07:00
Eric House
3e4384c2a8
when dict doesn't have built-in md5sum, or when in DEBUG code, call
...
back into java to get a sum. It's very slow for large dicts, but will
eventually be in a DB so only done once per dict that doesn't have it.
2012-09-13 05:39:44 -07:00
Eric House
ae2b6205bd
use mem_stream_make_sized
2012-09-11 19:17:27 -07:00
Eric House
0ccc2331b5
address bug where message was getting ACK'd by a device that failed to
...
save what it had ACK'd leaving the game permanently broken. Do that
by adding a new method game_saveSucceeded() called after the client
claims to have committed bytes returned by game_writeToStream() to
disk. In that method comms updates the value it'll use in subseqent
ACKs.
2012-09-10 07:31:45 -07:00
Eric House
95a7b14a3a
transmit dict's md5sum along with name in initial message from host to
...
guest. On guest, pass that sum into client code along with names so
the appropriate tests can be done and corrections taken.
2012-09-08 20:23:48 -07:00
Eric House
9a72f252ed
Merge branch 'android_branch' into android_dictname
2012-09-08 13:20:59 -07:00
Eric House
5a81484cf1
add md5Sum to DictInfo and add a getter
2012-09-08 10:11:18 -07:00
Eric House
077560bcd3
load md5sum if present
2012-09-08 09:42:23 -07:00
Eric House
4f180e9e14
pass rejecting dict name into java layer and display as part of turn
...
lost message.
2012-09-06 19:04:40 -07:00
Eric House
270a19f3aa
Revert "first of a set of changes to communicate to clients dictionary being"
...
This reverts commit b7a0f1489b
, which I didn't mean to check in on this branch.
2012-09-03 21:34:51 -07:00
Eric House
ea4d805d5f
first of a set of changes to communicate to clients dictionary being
...
used by server. Clients need to care if e.g. the server's disallowing
phonies based on its dict. Can only be sent if client is of latest
version. In that case, common code calls into new util function. In
future changes, BoardActivity's implemention of the callback will need
to check if the server's choice of dict is available, and if not offer
to download it. Once it's available, will want to install it.
2012-09-03 21:33:46 -07:00
Eric House
b7a0f1489b
first of a set of changes to communicate to clients dictionary being
...
used by server. Clients need to care if e.g. the server's disallowing
phonies based on its dict. Can only be sent if client is of latest
version. In that case, common code calls into new util function. In
future changes, BoardActivity's implemention of the callback will need
to check if the server's choice of dict is available, and if not offer
to download it. Once it's available, will want to install it.
2012-09-03 21:29:21 -07:00
Eric House
4ffb4efb0c
silence compiler warning
2012-08-30 19:10:52 -07:00
Eric House
145317426d
Fix prefix matching to accept letters constituting the first part of a
...
digraph tile when at the end of a prefix so that e.g. GORIL in Catalan
will list GORIL·LA (rather than nothing since GORIL, ending with the L
tile, is not a prefix.)
2012-08-27 21:50:09 -07:00
Eric House
08aa9b66e8
also load new desc field in android client, and add jni call to retrieve it
2012-08-26 20:59:17 -07:00
Eric House
ec0702d584
initialize buffer that common code will pass to strcat.
2012-08-10 21:31:01 -07:00
Eric House
27cbd0e0c9
go with end-game change that takes remaining tiles into account for
...
robots but not for hints.
2012-08-01 20:31:21 -07:00
Eric House
464696566d
get rid of NODE_CAN_4. Not change to post-compiled code
2012-08-01 20:29:15 -07:00
Eric House
9b0436d1ee
Make rem string measure function return boolean to indicate rect will
...
be invisible rather than setting width and height to 0. No real
change beyond simplifying/speeding platform code.
2012-07-15 09:30:27 -07:00
Eric House
bd70a1dd7d
improve text in remaining tiles dialog, and always show the tiles for
...
all trays rather than excluding those in current player's tray.
2012-07-09 21:44:29 -07:00
Eric House
318cc52f5a
we need the base64 stuff even when don't have SMS -- for serialization.
2012-07-07 11:05:45 -07:00
Eric House
2e6b64a4e4
complete implementation of java part of one-pass scoreboard draw. Now
...
looks pretty much identical to what the old code draws except that
rather than having width allocated in proportion to requested size all
get the same width except the one whose score it is which gets 2x.
2012-07-01 17:24:50 -07:00
Eric House
2434d85684
don't pass the same player-1 data for every player
2012-07-01 16:01:01 -07:00
Eric House
89ffd972bf
more work on single-pass scoreboard drawing. Now the jni stuff is
...
finished, but disabled via compile-time flag, and there's a
commented-out rudimentary implementation on the java side.
2012-07-01 10:04:10 -07:00
Eric House
b9b58bd0a5
enable tray tap undo
2012-06-29 06:52:49 -07:00
Eric House
c8e2dff962
start process of compiling with XWFEATURE_SCOREONEPASS enabled by
...
adding stubbed-out methods and making old methods conditionally
compiled. No change in code.
2012-06-27 07:08:09 -07:00
Eric House
405cb23023
fix bug where current player's scoreboard would disappear if other
...
players' names were too long by giving all a the same proportion of
what they request and passing in the percent given in case draw
implementation wants to use it as a cue to truncate.
2012-06-15 06:26:40 -07:00
Eric House
6257c14436
include trayVisState in GameStateInfo on the java side
2012-06-05 22:13:58 -07:00
Eric House
a0336ebb01
turn on new HASH_STREAM feature
2012-05-29 07:26:51 -07:00
Eric House
0b1a9a67fe
add param to server_handleUndo to prevent it from undoing all moves in
...
robot-vs-robot game, which is the wrong thing to do during a test
simulating play.
2012-05-24 22:25:30 -07:00
Eric House
9ba663ab98
implement util_phoneNumbersSame in java and call telephony's number
...
compare method. Skip the java call when the numbers are
strcmp-identical.
2012-05-18 07:41:46 -07:00
Eric House
867e9ffc2f
implement stubbed-out util_phoneNumbersSame so that three-device SMS
...
games work in emulator. May need to call into java to use Android's
more sophisticated phone number comparison to work on devices.
2012-05-18 07:17:21 -07:00
Eric House
3a54aa0ebc
add util_informUndo() that gets called, and puts up a dialog, after
...
remote device has performed an undo on a committed turn.
2012-05-14 07:01:02 -07:00
Eric House
013d9c689b
fix bug introduced with dictionary lookup of words played that meant
...
trades didn't get reported as remote moves -- it just became your turn
without notice.
2012-05-09 18:22:05 -07:00
Eric House
d846f96ec5
post-code-review cleanup: no significant change
2012-05-09 06:51:06 -07:00
Eric House
fd4ad0ae31
turn on board hashing and bigboard options (in protocol, not UI)
2012-05-04 06:16:02 -07:00
Eric House
fd18d8c95a
add boolean param to jni version of comms_resendAll() to ack
...
afterwards. Saves some extra jni calls. Then make comms_ackAny()
separately-useable, and use from BoardActivity after receiving
SMS messages.
2012-04-19 00:03:22 -07:00
Eric House
033a69be8d
to make it easier to tell games apart, print the number[s] of the
...
remote device[s] as part of summary view and in game config screen
(read-only). Use same field in summaries table for remote phone
numbers and bt addresses.
2012-04-18 23:23:36 -07:00
Eric House
1134f71b7b
use new comms_ackAny() call to send ACKs at points where currently
...
resendAll is being called. Dramatically reduces SMS message count
when app is being relaunched and backgrounded between turns.
2012-04-14 18:00:43 -07:00
Eric House
1e22a33d55
go back to android-7 SDK version to support 2.1, and to make that work
...
remove use of java base64 encoding in favor of the C version I'd
already written (and that was probably compiled into the library
anyway unless the strip step catched unused code.)
2012-03-26 20:03:29 -07:00
Eric House
235807df4f
remove logging
2012-03-19 07:37:16 -07:00
Eric House
fe614e9efc
delegate phone number comparison to platform code which in Android
...
case has a method for it. strcmp is not enough.
2012-03-19 07:36:18 -07:00
Eric House
631666cede
don't call DeleteLocalRef on an object to be returned from the JNI.
...
Crashes ICS bigtime. This needs to be ported back to android_branch.
2012-03-14 20:26:23 -07:00
Eric House
cd8889f90e
Merge branch 'android_branch' into android_bt
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
xwords4/linux/Makefile
2012-03-12 07:04:06 -07:00
Eric House
a8cf03f68e
optimization: allocate tmp buffer on stack rather than with malloc.
2012-03-11 14:51:51 -07:00
Eric House
739b0b6125
fix off-by-one assertion
2012-03-09 23:51:39 -08:00
Eric House
fdfbd792f7
Merge branch 'android_branch' into android_bt
2012-03-05 20:08:43 -08:00
Eric House
edf13be4c8
I'm getting a crash on 2.1 in the simulator when calling
...
DeleteGlobalRef then NewGlobalRef on the same ref. So use a temp to
reverse the order. May fix reported crash as well.
2012-03-05 20:04:32 -08:00
Eric House
cb1e1692b2
turn off BT in main part of tree and fix a couple of places not
...
dealing with that correctly.
2012-02-29 06:47:19 -08:00
Eric House
b7f82475b8
fix to compile when XWFEATURE_BLUETOOTH not set
2012-02-27 20:31:01 -08:00
Eric House
2282a976f3
add missing PKG_PATH invocation
2012-02-27 20:01:12 -08:00
Eric House
642ba9bc61
fix off-by-one assertion
2012-02-22 12:58:33 -08:00
Eric House
1f4f6a06a8
Merge branch 'android_branch' into android_bt
...
Conflicts:
xwords4/android/XWords4/jni/xwjni.c
2012-02-15 18:18:26 -08:00
Eric House
8590aae9b2
fix emacs compile-commands
2012-02-15 18:07:19 -08:00
Eric House
88ad6d81ef
Merge branch 'android_branch' into android_bt
...
Conflicts:
xwords4/android/XWords4/jni/xportwrapper.c
xwords4/android/XWords4/jni/xwjni.c
2012-02-13 22:38:17 -08:00
Eric House
82b232cf74
use a macro instead of lots of repetitions of the package path to make
...
it easier to modify.
2012-02-13 22:13:23 -08:00
Eric House
74aeeca8e0
move BT device listing into its own Activity. Call it from
...
NewGameActivity and from BoardActivity when the new notifyMissing
method gets called. Works as before called from NewGameActivity but
BoardActivity crashes on iterating over list of devices returned.
2012-02-09 05:21:23 -08:00
Eric House
3bda56420c
turn on XWFEATURE_BLUETOOTH
2012-02-07 17:38:50 -08:00
Eric House
47c3bd3090
track a BT game's set (singleton for two-device game) of remote
...
devices in summary DB so, e.g., we can quickly determine what games
care when a devices becomes available via BT. First use of this is
notifying when a remote game's deleted -- least that's the plan. This
commit just adds to the DB and scans the DB to build a map of
device->gameIDs array.
2012-02-06 19:02:19 -08:00
Eric House
796baffa6d
Merge branch 'android_branch' into android_bt
2012-02-06 18:13:57 -08:00
Eric House
bfe04a08b5
removed unneeded null-byte addition
2012-02-06 18:11:30 -08:00
Eric House
a2b5274b6c
on ICS CreateGlobalRef doesn't return the same value as is passed in.
...
So stop assuming it does! Fixes multiple crashes on ICS and need to
be ported to android_branch.
2012-02-05 19:12:09 -08:00
Eric House
8947ddca0b
on ICS CreateGlobalRef doesn't return the same value as is passed in.
...
So stop assuming it does! Fixes multiple crashes on ICS and need to
be ported to android_branch.
2012-02-05 19:11:38 -08:00
Eric House
8793d8f4fd
include seed and missingPlayers in any non-standalone game summary
2012-02-03 17:03:47 -08:00
Eric House
b4b7609894
include hwAddr as well as device name in bt section of address
2012-01-31 18:48:59 -08:00
Eric House
e91c0daf65
check for null obj before calling through its vtable
2012-01-31 06:44:54 -08:00
Eric House
094d08e903
Get play via BT working!!! Replace BTConnection with BTService to make
...
keeping the listener/sender threads going much easier. Create new
message sink to dispatch incoming messages, and start passing return
addresses into comms (not required before when relay was only
transport as it has no return addresses.)
2012-01-30 06:39:18 -08:00
Eric House
0934f83106
add gameID to params passed to comms' sendproc, including passing
...
through to java layer.
2012-01-25 18:27:37 -08:00
Eric House
ac6ecfa845
copy bt_hostName as part of address
2012-01-24 06:51:40 -08:00
Eric House
5f77ef6e13
get uuid from C code so can ensure linux version has same.
2012-01-19 18:28:27 -08:00
Eric House
2a51f8d621
cleanup
2012-01-17 06:53:47 -08:00
Eric House
d0999d1944
update build scripts to use newer NDK.
2012-01-02 18:11:36 -08:00
Andy2
2a34cd1e05
remove second param from server_do() -- it doesn't work anyway.
2011-12-21 18:45:05 -08:00
Andy2
17edc79aaf
Merge branch 'android_branch' into send_in_background
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2011-12-06 19:56:10 -08:00
Andy2
0474984b82
export new preference from jni and add a checkbox setting for it
2011-12-06 18:18:50 -08:00
eehouse@eehouse.org
e1e8516e1b
Merge branch 'android_branch' into send_in_background
2011-12-02 19:04:12 -08:00
Andy2
52d02f04dd
pass tile value into drawCell(). Java code doesn't use it yet, but I
...
want to play with drawing cells tray-tile-style when they're big
enough.
2011-12-02 18:58:52 -08:00
Andy2
d37424ad7f
Merge branch 'android_branch' into send_in_background
...
Conflicts:
xwords4/linux/linuxutl.h
2011-11-21 22:18:52 -08:00
Andy2
e1e9a68d8f
fix ptr out-of-bounds test. Was failing an empty dict.
2011-11-21 18:04:20 -08:00
Andy2
b86330c71f
add dict_iter_getCounts()
2011-11-18 21:10:17 -08:00
Andy2
f06eaa573b
fix to compile with API changes
2011-11-18 07:41:13 -08:00
Andy2
4760ceda5a
Merge branch 'android_branch' into android_browsedict
...
Conflicts:
xwords4/android/XWords4/jni/anddict.c
2011-11-17 20:55:02 -08:00
Andy2
aab9fd9df2
test the variable that may have been changed, not the one that holds
...
the pre-change value.
2011-11-17 06:54:26 -08:00
Andy2
63c0c5cf09
fix compile warning by passing ptr to embedded super
2011-11-17 06:11:42 -08:00
Andy2
2492e7cfc5
Merge branch 'android_branch' into send_in_background
...
Conflicts:
xwords4/linux/cursesmain.c
2011-11-13 17:10:46 -08:00
Andy2
44c5500ab0
don't crash when empty or corrupt dict file passed in.
2011-11-11 18:29:26 -08:00
Andy2
9ff4596667
fix compile warning by passing ptr to embedded super
2011-11-11 07:42:00 -08:00
Andy2
92eb6b857d
allow null info ptr so getInfo can be used solely to run sanity check
...
on dict.
2011-11-11 07:41:31 -08:00
Andy2
dddec50f1d
Merge branch 'android_branch' into android_browsedict
...
Conflicts:
xwords4/android/XWords4/jni/Android.mk
xwords4/linux/Makefile
xwords4/linux/linuxmain.c
2011-11-10 19:22:57 -08:00
Andy2
284bd2d0c4
turn on sanity checking of dicts in download directory, but from
...
DictLangCache rather than when the directory's walked initially. Need
to test still with bogus dict and make sure it's never shown.
2011-11-10 19:02:18 -08:00
eehouse@eehouse.org
214f8990bf
Merge branch 'android_branch' into android_browsedict
2011-11-04 17:23:27 -07:00
Andy2
ac875894a6
replace assert that occasionally fails with logging. Not sure why it
...
fails, but I just drop the (timer) event in the non-debug case so it's
probably harmless.
2011-11-04 17:19:50 -07:00
Andy2
57a1069efe
wire min/max through jni: now selecting numbers changes the number and
...
length of words selected. But it's really slow, and indexing seems
broken in some cases. Not ready for release yet.
2011-11-04 06:56:59 -07:00
Andy2
1bba95a985
add minmax compile-time flag, commented-out
2011-11-04 06:17:09 -07:00
Andy2
4e66747bbc
fix for changed API
2011-11-03 21:35:17 -07:00
Andy2
a5498ee33a
fix find to return position rather than boolean
2011-11-03 05:20:11 -07:00
Andy2
c222f08252
catch up with API changes.
2011-11-02 18:46:06 -07:00
Andy2
050a68ce42
use XP_REALLOC now that it's fixes
2011-11-02 05:04:31 -07:00
Andy2
9f2158f094
add dict_getStartsWith to jni
2011-11-01 18:43:36 -07:00
Andy2
482aca5cfb
fix crash due to bad allocation of indexing data space. First cut
...
used XP_REALLOC, but that turns out to be broken, at least on android.
Haven't really used it before...
2011-11-01 18:33:29 -07:00
Andy2
11b7ed1e8e
fix to compile with new dictiter files
2011-10-31 21:11:22 -07:00
Andy2
3c53da46ce
fix to compile with changed API. Crashes, but want to fix up API in
...
other branch before debugging here....
2011-10-31 18:22:33 -07:00
Andy2
7d1e9c7638
Merge branch 'android_branch' into android_browsedict
...
Conflicts:
xwords4/android/XWords4/jni/Android.mk
xwords4/android/XWords4/res/values/strings.xml
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
2011-10-28 22:27:22 -07:00
Andy2
8d228ae190
turn on face-up tile picking for Android (though there's no prefs UI
...
to enable it for a game yet). In common code, break pick tile utils
method in two, one for blank and the other for tray tiles. In java,
implement dialog for picking the tiles. Works, though is a bit clumsy
to have the dialog come and go after every pick. Better would be a
dialog that stays up and accumulates picks -- but it'd have to know to
reduce the set of tile choices as letters are chosen. This'll do for
now.
2011-10-28 22:15:56 -07:00
Andy2
b490618c8e
silence warning with cast
2011-10-28 06:34:59 -07:00
Eric House
ed055b83c6
export index from jni and use for fastscrolling. Works, but is a bit slow still.
2011-10-27 07:01:57 -07:00
Andy2
a7ce5a43de
fix so count comes from dict; combine two jni methods into one; fix
...
crash in destructor. Now an entire dict can be scrolled through if
you have the patience.
2011-10-25 18:36:12 -07:00
Andy2
74cf751729
use existing dict iteration APIs to implement jni that adequately
...
displays a dict. But I don't have a getNth in C to implement the one
I've added in java; need to add that, and caching, to speed it up.
2011-10-24 20:15:52 -07:00
Andy2
c237717de5
dict_getInfo returns false if the dict doesn't parse so can be used to
...
test validity of downloaded dict. Internally (in jni), add lots of
checks that format is correct and we don't run off end of ptr walking
truncated dict.
2011-10-23 14:21:57 -07:00
Andy2
4eee7f8aa7
Pass selected tiles into new util function, and from there into java
...
world, so confirming query can include them.
2011-10-19 18:34:26 -07:00
Andy2
f41d3c27e6
Merge branch 'android_branch' into send_in_background
...
Conflicts:
xwords4/common/server.c
2011-10-19 06:23:16 -07:00
Andy2
90b0a4e46f
if words stream is null, don't pass into java code (where current impl
...
will get a NPE)
2011-10-18 21:28:50 -07:00
eehouse@eehouse.org
5afb0ae145
Merge branch 'android_branch' into send_in_background
2011-10-14 22:34:29 -07:00
Andy2
6793742f0f
remove option to list all words played in a single lookup dialog, and
...
supporting code in the jni/common C.
2011-10-14 22:32:30 -07:00
Andy2
0e6b4d749f
When pen held on committed tile on board, cons up list of all words
...
played that include that tile and pass to new util_cellSquareHeld()
method. In java implementation of that method, use existing lookup
activity code to display list of words. Enabled on the C side by a
compile-time flag in case it has problems. Right now the time spent
saving a game before launching the lookup activity, and reloading it
after, is pretty apparent, but that's in emulator which is slow.
2011-10-13 19:14:08 -07:00
eehouse@eehouse.org
471a9d988d
Merge branch 'android_branch' into send_in_background
2011-10-05 07:10:52 -07:00
Andy2
90f11abc37
add to game state passed into java world whether it's the cur selected
...
player's turn, and use that to enable/disable Pass/Turn done button.
2011-10-05 06:36:01 -07:00
Andy2
c5c0fbccae
remove unused DrawFocusState params from jni interface
2011-10-04 19:03:27 -07:00
Andy2
dc20b04a4c
remove unused param (on the C/jni side)
2011-10-04 18:54:53 -07:00
Andy2
3ec97d5c07
Turn "Turn done" into "Pass" when the pending score is 0. To do that
...
I had to pass the score into draw_trayBegin since
draw_drawPendingScore() isn't called until the first tile's placed.
Note: as long as I'm messinng with this menuitem it should be disabled
when it's not the player's turn.
2011-10-04 18:48:33 -07:00
eehouse@eehouse.org
82615f409b
Merge branch 'android_branch' into send_in_background
2011-10-04 06:49:19 -07:00
Andy2
f4b8b2806e
remove unused parameter
2011-10-04 06:48:53 -07:00
Andy2
5dd21a16ea
don't crash if words stream is null, as it will be when turn's a pass.
2011-10-04 06:45:16 -07:00
Andy2
35e4c21f17
add util_informMove to jni. Use it, but not to advantage yet.
2011-10-02 16:42:10 -07:00
Eric House
f0c3e2c5f0
Merge branch 'android_branch' into send_in_background
2011-09-22 17:22:01 -07:00
Andy2
fcdbed0920
fix to work with changed C api
2011-09-22 06:49:34 -07:00
Andy2
92614370ce
Merge branch 'android_branch' into send_in_background
...
Conflicts:
xwords4/common/comms.c
2011-09-20 06:21:54 -07:00
Andy2
dced47e202
export server_listWordsPlayed via jni.
2011-09-18 19:06:23 -07:00
eehouse@eehouse.org
98c2617613
Merge branch 'android_branch' into send_in_background
2011-09-14 06:47:12 -07:00
Andy2
c9c498786e
add to game state whether any tiles selected. Use that to disable
...
'commit exchange' button when there's nothing to commit, and get rid
of error message used when committing nothing since it's now
impossible (on Android).
2011-09-09 19:04:25 -07:00
eehouse@eehouse.org
eb0e41e978
Merge branch 'android_branch' into send_in_background
2011-09-08 21:38:50 -07:00
Andy2
2aa5447301
remove some logging
2011-09-08 19:03:08 -07:00
Eric House
84931f34ff
Merge branch 'android_branch' into send_in_background
2011-09-07 21:44:36 -07:00
Andy2
8087153b73
log name of dict being set -- as an easy way to confirm that the right
...
dicts are getting passed to the jin.
2011-09-03 20:19:51 -07:00
Andy2
da475347a5
get rid of unused constants
2011-09-02 18:36:26 -07:00
Andy2
2d2f3e23fd
change signature of util_playerScoreHeld(): pass player num rather
...
than formatted text. Client code can use new
model_getPlayersLastScore() or whatever else it wants to build text to
show the user.
2011-09-02 18:36:03 -07:00
Andy2
42950c38bd
export model_getPlayersLastScore()
2011-09-02 18:33:34 -07:00
Andy2
e94524958f
get rid of util_setInTrade(); fix passing of selBits when trading
...
(broken with prev checkin.)
2011-09-01 19:51:26 -07:00
eehouse@eehouse.org
b6e5327b1a
Merge branch 'android_branch' into send_in_background
2011-08-31 06:46:42 -07:00
Andy2
671877cbca
implement new util_ methods in jni and java; remove old miniwindow
...
stuff. In java, respond to util_playerScoreHeld() and
util_bonusSquareHeld() by putting up toasts with existing strings.
For util_setInTrade(), fix exchange mode. Add two buttons at bottom
that replace toolbar (and corresponding buttons on menu). Redraw
scoreboard and board with high transparency to make it clear they're
disabled. Still to do: deal with case where ability to switch which
player's tray is visible is enabled.
2011-08-31 06:37:33 -07:00
Eric House
c01981bc8f
Make miniwindow stuff compile-time optional. The goal's to use native
...
features where they look better or are easier to manage, e.g. Toasts
and dialogs on Android.
2011-08-29 20:36:01 -07:00
eehouse@eehouse.org
147687890f
Merge branch 'android_branch' into send_in_background
2011-08-24 06:52:51 -07:00
Andy2
84e61f3b3f
remove no-op line
2011-08-22 18:43:42 -07:00
Andy2
c41af221b7
fix non-debug compile warning
2011-08-21 11:33:23 -07:00