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

5534 commits

Author SHA1 Message Date
Eric House
739b0b6125 fix off-by-one assertion 2012-03-09 23:51:39 -08:00
Eric House
e145a04111 add missing variable assigment 2012-03-09 22:11:51 -08:00
Eric House
d732094c59 rename LookupView to LookupActivity 2012-03-08 07:58:19 -08:00
Eric House
0d69c6097a Go back to lookup dialog as dialog-themed activity. I just can't get 
contrast right on all platforms any other way.  Previous change to
using dialogs was motivated by speed, but I don't see any slowdown so
far.  Will address if I find it.
 2012-03-08 07:54:36 -08:00
Eric House
25f4e8b707 Merge remote-tracking branch 'origin/android_bt' into android_bt 2012-03-06 21:27:53 -08:00
Eric House
3aa6932f03 Merge remote-tracking branch 'origin/android_branch' into android_branch 2012-03-06 21:27:38 -08:00
Eric House
a2493ffa97 Merge branch 'android_branch' into android_bt 2012-03-06 07:47:05 -08:00
Eric House
6a635d1631 Go back to using a built-in list item resource. Mine was 
white-on-white on several OS versions.  Need to test further to try to
reproduce the conditions that had me trying to manage contrast myself.
Or use a dialog-themed Activity for lookup dialog -- prev checkins say
that was too slow but that might be fixable....
 2012-03-06 07:41:33 -08:00
Eric House
9d153b500c don't insist that dgb .apk exist if it't not what's being installed 2012-03-06 07:36:07 -08:00
Eric House
2a8a5eb2e9 up version strings and changes list 2012-03-06 06:23:48 -08:00
Eric House
24ac205917 cleanup -- no behavior change 2012-03-06 06:23:04 -08:00
Eric House
fb45ea639f make buttons same size 2012-03-05 20:38:43 -08:00
Eric House
ae81f07997 add test for BTSUPPORTED to function so compiler can strip it 2012-03-05 20:30:02 -08:00
Eric House
57a1759b69 remove empty btconfig area from game config dialog 2012-03-05 20:24:48 -08:00
Eric House
82e1c826a6 add pre-clean target other build.xml files have 2012-03-05 20:14:54 -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
79be6654dc -p to allow multiple runs 2012-03-05 19:16:03 -08:00
Eric House
319c9da258 add -pre-clean that invokes the jni's 'make clean' 2012-03-05 19:07:49 -08:00
Eric House
a0b38ed83f Merge branch 'android_branch' into android_bt 2012-03-04 08:19:24 -08:00
Eric House
ef0c301e1a fix NPEs that would occur if play and back buttons pressed at about 
the same time by ignoring the second if we've already closed the game
being edited.
 2012-03-04 08:18:54 -08:00
Eric House
542f10a3e5 improvements to work with variants -- though jni still doesn't compile. 2012-03-02 05:49:25 -08:00
Eric House
d2952794af add variant support 2012-03-01 22:10:41 -08:00
Eric House
49b04257d3 tweak date format 2012-03-01 18:16:04 -08:00
Eric House
1fc814b104 0, not -1, is an invalid gameid 2012-03-01 18:14:51 -08:00
Eric House
1a9b3a7c63 make helper class to provide game-name dialog, use it for renaming and 
to query for name of BT game being created.
 2012-03-01 07:57:04 -08:00
Eric House
788f241238 new files to .gitignores; go back to discarding build command output 2012-03-01 06:32:49 -08:00
Eric House
3723cf08fa remove checked-in variant now that smaller one exists 2012-03-01 06:16:51 -08:00
Eric House
fc607fbd73 fix new standalone games being confused with networked ones by making 
default new addr type be NONE and checking CurGameInfo for whether
device is networked.  The default change may introduce problems: needs
testing.
 2012-02-29 18:22:20 -08:00
Eric House
10d2d222e5 Merge branch 'android_branch' into android_bt 2012-02-29 17:59:54 -08:00
Eric House
9194bbe4b1 replace large with small on the -dbg version 2012-02-29 17:49:34 -08:00
Eric House
dcbbb26e1c move app name out into separate file so the big one doesn't have to be 
checked in in multiple places.
 2012-02-29 17:48:31 -08:00
Eric House
e8ab6ede42 remove BT-related stuff from non-BT variant 2012-02-29 07:59:48 -08:00
Eric House
36908226c1 remove ping command/menu item 2012-02-29 07:36:38 -08:00
Eric House
241e9c1fde check in files that are now different for BT variant (i.e. required 
for BT to be enabled)
 2012-02-29 06:49:30 -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
c1c20db6dd add static final boolean by which to turn BT support off and change so 
UI and background service disappear/don't run when it's off.  Goal's
to ship two apps that differ in this setting, a change in Android.mk,
and little else.
 2012-02-27 20:35:31 -08:00
Eric House
b7f82475b8 fix to compile when XWFEATURE_BLUETOOTH not set 2012-02-27 20:31:01 -08:00
Eric House
eec1cb00a1 wrap UUID in #ifdef XWFEATURE_BLUETOOTH 2012-02-27 20:30:48 -08:00
Eric House
21e69adda7 add various files required for new variant. Plan is this will be a 
separate version of the app with Bluetooth support included.
 2012-02-27 20:02:15 -08:00
Eric House
2282a976f3 add missing PKG_PATH invocation 2012-02-27 20:01:12 -08:00
Eric House
7644eb69cf Merge branch 'android_branch' into android_bt 2012-02-27 19:41:04 -08:00
Eric House
933b812d3a paths within src directory need to change to match class names. Not 
sure how I thought this was working before.
 2012-02-27 19:40:48 -08:00
Eric House
0732da0724 checking this file in -- the first to be different in a variant 2012-02-27 19:39:36 -08:00
Eric House
0578c3de24 remove duplicate string since it's ignored anyway. 2012-02-27 19:39:03 -08:00
Eric House
213f1454fb remove duplicate string since it's ignored anyway. 2012-02-27 19:38:27 -08:00
Eric House
22f866cc87 right dir name 2012-02-27 19:34:02 -08:00
Eric House
ac2fd069f1 wrong dir name 2012-02-27 19:33:44 -08:00
Eric House
1ea892e88e add variant option 2012-02-27 19:32:57 -08:00
Eric House
6496736625 take .apk file as optional param 2012-02-27 19:15:53 -08:00
Eric House
1892ccf640 Merge branch 'android_branch' into android_bt 2012-02-27 18:28:17 -08:00
Eric House
840385b3ad print dates in shorter format so columns don't wrap as frequently 2012-02-27 18:28:04 -08:00
Eric House
f1956ddcb4 prevent continuing attempts to send messages from client after it's 
deleted the game those messages are part of.  I'm keeping a list of
dead games and checking against that, and currently that list will
grow for as long as the sender thread lives.  Shouldn't be a problem
but needs fixing.  Better would be to remove all messages from queues,
but that has synchronization issues.
 2012-02-27 07:57:54 -08:00
Eric House
456dcca7b8 don't crash when device list empty 2012-02-27 07:50:11 -08:00
Eric House
34f3c38b48 Add "clear selected" button to btinviter UI that's enabled when one or 
more is checked.  On launch, get the set of known device, and on scan
do NOT start by emptying.  This allows to maintain a set of devices
and still scan without losing those not present.
 2012-02-25 10:43:08 -08:00
Eric House
99e0fea3c3 use resource rather than hard-coding name of game. 2012-02-22 14:09:03 -08:00
Eric House
1b542a1d22 using the version of BluetoothServerSocket.accept that doesn't take a 
timeout makes it slightly more likely that HTC Sensation will notice
an incoming connection, but it's still unusable most of the time.
 2012-02-22 14:08:38 -08:00
Eric House
cf77872dd4 test for null object before calling method 2012-02-22 14:06:47 -08:00
Eric House
7cef230e2c BTEventListener is implemented by superclass, so override rather then 
implement the interface.
 2012-02-22 14:06:15 -08:00
Eric House
7a21d4c151 show the giving up message as a dialog rather than a toast 2012-02-22 14:04:36 -08:00
Eric House
eecc609eae take .apk file as optional param 2012-02-22 13:01:00 -08:00
Eric House
8c7487dc91 use GameUtils.getName() to avoid NPE -- it doesn't return null 2012-02-22 13:00:16 -08:00
Eric House
642ba9bc61 fix off-by-one assertion 2012-02-22 12:58:33 -08:00
Eric House
9c217e924c use dialog theme for btinviter activity 2012-02-22 12:58:15 -08:00
Eric House
12de8bf38b change button text from Ok to Invite 2012-02-22 10:37:10 -08:00
Eric House
6f2b5a9c8d don't ask to invite when opening unconnected BT game immediately after 
sending an invitation.
 2012-02-22 10:36:37 -08:00
Eric House
b2f67cfcce don't try to send without an address. Fixes an occasional assertion 
failure.
 2012-02-22 10:35:22 -08:00
Eric House
01c86522ef bt icons now have green and red arrows to show connectedness. Still 
needs an artist's touch.
 2012-02-22 10:34:16 -08:00
Eric House
10f41e5c5b Merge branch 'android_branch' into android_bt 2012-02-22 09:52:31 -08:00
Eric House
72e114838f commented-out function to send a .xwd as an email attachment. I can't 
get it to work but it's worth keeping for a try later.
 2012-02-22 09:51:35 -08:00
Eric House
ca7a0a5913 fix to work on devices too 2012-02-22 09:49:57 -08:00
Eric House
03fcbb3ddc comment out unused button; cache list of known local devices and use 
that as starting point so initial scan can be skipped.  When unable to
deliver a message to remote device, give up after three tries and send
message to that effect.
 2012-02-22 08:02:11 -08:00
Eric House
4600ea12bf add methods to get/set cache of known BT devices (key strings required 
for prev commit)
 2012-02-22 07:51:50 -08:00
Eric House
a6f35af187 add methods to get/set cache of known BT devices 2012-02-22 07:50:33 -08:00
Eric House
a6a13bcffd add new BTEvent to tell UI that a message will be resent, and in UI 
put up a toast naming the unavailable device.  Might want a backoff on
this....
 2012-02-15 18:55:58 -08:00
Eric House
7d573970e0 move handler and post() into Activity superclasses 2012-02-15 18:38:49 -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
e7a5882ed9 add a state transition lack of which fired an assert -- and that's 
rare but consistent with others.
 2012-02-15 18:17:26 -08:00
Eric House
14a3a5a7aa Save which languages are displayed opened as an invisible preference 
rather than in a static so it is more persistent.
 2012-02-15 18:16:46 -08:00
Eric House
3a657eb40d Merge remote-tracking branch 'origin/android_branch' into android_branch 2012-02-15 18:09:45 -08:00
Eric House
8590aae9b2 fix emacs compile-commands 2012-02-15 18:07:19 -08:00
Eric House
663734d0da When a message isn't sent, keep it in a per-target-device queue and 
try again in five seconds This seems to fix nearly all stalls.
Eventually will try notifying users and backing off on the resends.
 2012-02-15 06:14:40 -08:00
Eric House
3acc38076b move methods inside the threads that are their only callers. No 
behavior change.
 2012-02-15 04:53:34 -08:00
Eric House
9a2b488183 Merge branch 'android_branch' into android_bt 2012-02-14 16:56:20 -08:00
Eric House
914fa857be return COMMS_CONN_NONE as address type of null comms rather than asserting. 2012-02-14 16:54:19 -08:00
Eric House
dde97562e4 Merge branch 'android_branch' into android_bt 2012-02-13 23:36:44 -08:00
Eric House
45f2134ab5 fix variant generation -- seems to work now. JNI was broken. 2012-02-13 23:35:41 -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
e3ffbd57ba add .gitignore files generated by script 2012-02-13 22:27:08 -08:00
Eric House
cf9ab45e6f finish first pass at build variant generation. This works well enough 
that the app so generated runs in emulator, talks to relay, and does
not crash.  Makefile has rules for .java, .xml and .h that run through
sed to xw4 in import statements, package names etc so the variant app
is in a different namespace.  Also honors any files in the variant
tree that are actually checked into git should it be necessary to make
changes beyond what sed can manage.
 2012-02-13 22:25:27 -08:00
Eric House
8590466229 stop changing directiories/assuing where it'll be run from 2012-02-13 22:15:34 -08:00
Eric House
05c220cf40 launch NDK build from inside build.xml. 2012-02-13 22:15:12 -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
a2d54794c9 Merge remote-tracking branch 'origin/android_branch' into android_bt 2012-02-12 22:30:11 -08:00
Eric House
1ed1bce7d1 call informMissing after loading game -- before that it'll never be 0. 2012-02-12 22:27:58 -08:00
Eric House
0f8ddadd69 make work from more than one directory 2012-02-12 21:23:50 -08:00
Eric House
f2b86b2a71 work-in-progress on scripts to generate a second app from the same source tree. 2012-02-12 21:22:36 -08:00
Eric House
f40f2bffcf add game name as something passed with invitation. Later will get it 
from user.  Idea is to make it easy to identify the games in GamesList
on two devices side-by-side.
 2012-02-10 18:48:46 -08:00
Eric House
43dca99a2c add preliminary text including number missing. 2012-02-10 18:44:27 -08:00
Eric House
114db0c96a cleanup: consistent param name 2012-02-10 18:08:59 -08:00