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

573 commits

Author SHA1 Message Date
Andy2
2d66913323 populate public rooms list as soon as checkbox set -- and mention 
language and number of players in failure message
 2010-10-17 21:13:14 -07:00
Andy2
56e83bfc1c trim leading and trailing whitespace from roomnames. If somebody has 
two spaces between words those will still matter.
 2010-10-17 20:45:48 -07:00
Andy2
332ff27d8a use same string for both 2010-10-17 20:30:43 -07:00
Andy2
a58e74b70a add play game button at bottom of game config dialog. 2010-10-17 20:27:21 -07:00
Andy2
5c958eaadb deal with null socket (e.g. if in airplane mode); deal with new public 
rooms format.
 2010-10-17 20:18:24 -07:00
Andy2
885bfe4779 remove values button. Seven buttons is too much. Add back when have 
means of assigning priority so it only shows up when there's space.
 2010-10-17 18:42:44 -07:00
Andy2
b63d730b53 compare languages rather than actual dict names so can switch dicts 
mid-game.
 2010-10-16 15:05:46 -07:00
Andy2
60e4c624e4 implement reply button; clear message edit field each time 2010-10-16 15:05:16 -07:00
Andy2
26b777acf8 don't post notification when results list returns empty 2010-10-16 11:01:12 -07:00
Andy2
a82051739b move interface; add some logging. 2010-10-16 10:49:25 -07:00
Andy2
91e95eb48b fix string (which should not be hard-coded!) and use new class. 2010-10-16 10:48:59 -07:00
Andy2
02ea8b13e0 move this functionality into RelayReceiver 2010-10-16 08:08:12 -07:00
Andy2
737b146093 Receiver replaces Activity as target of alarms. This seems to prevent 
flasing to the front when alarms fire which was causing all kinds of
grief.  But: not yet tested on device.
 2010-10-16 08:07:48 -07:00
Andy2
cd1ce339ed fix off-by-one error in reading from cursor 2010-10-16 07:57:47 -07:00
Andy2
a52c18522c use HashSet rather than relying on nesting (which I can't) to track 
whether I'm running
 2010-10-12 18:53:19 -07:00
Andy2
82d5f21d54 extend subclass of Activity or ListActivity 2010-10-12 18:27:50 -07:00
Andy2
c37ad2d650 register self with RelayService to be called directly if running when 
there's something to update.  Use handler to do this from non-UI thread.
 2010-10-12 18:27:13 -07:00
Andy2
8e8c4f4d31 if GamesList is frontmost when we have relayIDs to update then just 
call the interface it's registered.  Otherwise post notification.
 2010-10-12 18:25:29 -07:00
Andy2
ad9a249042 new files. Subclass Activity and ListActivity to track whether we're 
running (yeah, WTF, but that's what Android dev support says you have
to do!).  Special-purpose Activity to be the target of notifications
so I have more control on how to handle them.
 2010-10-12 18:21:18 -07:00
Andy2
392aeff7ad replace FLAG_ONE_SHOT with FLAG_UPDATE_CURRENT; seems to fix failure 
of notification to fire.
 2010-10-11 06:52:26 -07:00
Andy2
86b57526df show game name in title if not hidden 2010-10-11 06:47:33 -07:00
Andy2
56cd161d8b Pass list of relayIDs through activity to onNewActivity() added to 
GamesList, and inval those list elements that now have messages
pending so they redraw.  And add static method to be called from there
to cancel the status-bar notification now that it's been acted on.
 2010-10-09 21:44:42 -07:00
Andy2
76258f609a make sure game is still over before calculating final scores. Fixes 
assertion failure in server.c.
 2010-10-08 17:30:26 -07:00
Andy2
e855b51491 use new DB api to build list of relayIDs to send; set summary DB field 
and post notification on response.
 2010-10-08 06:52:43 -07:00
Andy2
3bbbd65077 use same 1.5-safe layout on all devices; add elem (a text field for 
now) to be shown when messages are pending; show it.
 2010-10-08 06:47:46 -07:00
Andy2
6ce5f36133 add msgsPending field set from new DB column; add methods to set 
column and to fetch relayIDs for games where it's not set, and to get
path for game based on relayID.
 2010-10-08 06:46:10 -07:00
Andy2
d5eff5af21 new column to track whether game has pending msgs 2010-10-08 06:42:51 -07:00
Andy2
cb4092bb39 make relayID a String rather than a byte[]; log result of pending 
messages query to confirm working.
 2010-10-06 05:21:19 -07:00
Andy2
861de8d592 call new method to start polling timer 2010-10-05 18:38:06 -07:00
Andy2
81fb934e4a new custom class for resetting polling timer on prefs change 2010-10-05 18:36:56 -07:00
Andy2
cd0d14b1bb new class will own setting summary for relay-polling frequency so don't do it here 2010-10-05 18:36:15 -07:00
Andy2
ae6edf4ace add static methods for starting timer. 2010-10-05 18:35:35 -07:00
Andy2
ed95d2e794 add proxy port to list whose values are displayed 2010-10-05 06:17:35 -07:00
Andy2
fae8faa0be add stubbed-out Reply button to msg received dialog. 2010-10-04 18:59:44 -07:00
Andy2
1ed8e7a66c fix crash: can't call dialog from non-UI thread 2010-10-04 18:53:33 -07:00
Eric House
b3c7cb3711 start on sending chat messages. Doesn't even compile -- committing to get onto another machine. 2010-10-04 05:38:05 -07:00
Eric House
1e13e92deb support for receiving and displaying chat messages. Compiles but not tested. 2010-10-03 18:32:39 -07:00
Andy2
f78b1747dd put up an alert when unable to find any public rooms 2010-09-28 18:58:05 -07:00
Andy2
0bfad7cd05 up timeout to 15 seconds. 2010-09-28 18:42:23 -07:00
Andy2
814f6887da put up a progress dialog while fetching public names that mentions 
params passed.
 2010-09-28 18:34:29 -07:00
Andy2
0b143efced add getLangName 2010-09-28 18:33:29 -07:00
Andy2
6b1dabd8e2 don't crash when public rooms list is empty 2010-09-28 18:32:43 -07:00
Andy2
953e4601b9 fetch public rooms using new class rather than hardcoding. With this 
checkin game is possible based on public-room lookup.
 2010-09-28 06:48:51 -07:00
Andy2
132321c9fd new AsyncTask subclass to fetch public rooms list from relay 2010-09-28 06:47:58 -07:00
Andy2
89d20578b8 new class to create socket for talking to proxy 2010-09-28 06:47:21 -07:00
Andy2
39827ec894 add new pref for relay's proxy/device port 2010-09-28 06:43:04 -07:00
Andy2
986ac4413f parse reply to query for number of pending messages for games on 
device.  Not doing anything with the info yet.
 2010-09-26 20:25:00 -07:00
Andy2
14edbd7f18 implement setIsServer(). With this change I've been successful -- 
once -- having two games on the same device play against each other.
 2010-09-24 18:49:34 -07:00
Andy2
31c594a06e everybody starts out as client by default, same as on linux 2010-09-24 18:48:52 -07:00
Andy2
63ac6542c6 add new action to be called when relay make me a client. Seems 
necessary to get server_initClientConnection connection called when
all's in the right state.  It's not working consistently yet, though,
so may need changes.
 2010-09-24 18:48:30 -07:00
Andy2
4ea9ff8226 add server_reset and util_setIsServer to jni 2010-09-24 18:45:42 -07:00
Andy2
0df651027f Merge branch 'android_branch' into relay_proxy 
Conflicts:
	xwords4/relay/crefmgr.cpp
 2010-09-20 19:55:53 -07:00
Andy2
bca8300495 changes for b16: version strings and changes summary text. 2010-09-20 19:48:52 -07:00
Andy2
0ac23458ba use constant 2010-09-20 18:42:43 -07:00
Andy2
e6545d8d57 set and save new booleans, etc. Relay params UI seems to work now 
except for listing public rooms (still hard-coded)
 2010-09-03 06:39:46 -07:00
Andy2
e20c63f38c move toward the UI I want: show public room browser or edittext for 
new room name depending on checkbox, etc.  Still not fully wired.
 2010-09-02 05:46:35 -07:00
Andy2
6d7ff11dcc add and set new field, dictLang 2010-09-01 06:50:33 -07:00
Andy2
cad2854d08 fix bug by always enabling set of widgets for local player in case 
prev invocation of dialog hid it.
 2010-08-31 06:21:46 -07:00
Andy2
4d1d7ae7ce put space between "Player 1" and "(robot)" 2010-08-31 06:20:29 -07:00
Andy2
9367251b33 lots of changes, still needing cleanup and a bit of debugging, to 
simplify game settings dialog and remove role: a game is now
standalone or not.  Games will be matched on the relay (or over BT, I
assume) based on how many players they provide vs. need -- and other
settings like dictionary
 2010-08-31 05:43:41 -07:00
Andy2
785ae531db add language name to dict names in GameConfig's menu too 2010-08-27 06:26:25 -07:00
Andy2
092236b0dd cleanup; do formatting inside DictLangCache 2010-08-27 06:25:56 -07:00
Andy2
40e266dda0 move lang strings into cache and add method to get 'em 2010-08-26 18:43:59 -07:00
eehouse@eehouse.org
ecd0280353 Merge branch 'android_branch' into relay_proxy 2010-08-26 18:36:55 -07:00
Andy2
0f3867b995 up constants/version for beta 15 2010-08-26 18:22:18 -07:00
Andy2
0313421634 Add new class to cache lang codes for dicts to prevent expensive 
operation of loading them each time.  Will have other uses later.
 2010-08-26 18:14:14 -07:00
Andy2
40d8aede88 use new jni method and array of names to append language to name of dict 2010-08-25 06:34:54 -07:00
Andy2
cf6d8efb29 new jni method to get lang code. Takes a dict's raw bytes and builds 
a dict object just to fetch the code, which is pretty inefficient, so
caching should be added later on the java side.
 2010-08-25 06:33:16 -07:00
Andy2
3b52f7bbd0 don't connect proxy unless there's at least one relay game 2010-08-23 18:53:11 -07:00
Andy2
b586fa1a34 add preference controlling how often proxy connects to relay. Still 
need to add way to change timer when interval pref is changed and
other cleanup.
 2010-08-23 18:39:47 -07:00
Andy2
a34ccb424f device now passes list of "relayID"s, consisting of connName plus 
device id, to relay, one for each stored game that's communicating via
the relay.  Relay parses out each relayID.  Next relay can use these
to look up whether messages are available and reply with that, and
device can put up a notification.
 2010-08-22 12:16:57 -07:00
Andy2
56b6a425e2 proxy now writes one byte to relay and reads one byte reply. 2010-08-19 18:34:28 -07:00
Andy2
48ac79be51 GamesList starts a repeating alarm that invokes a new activity that 
launches the service.  Service can now do a single check with the
relay, notify if needed, and exit (but doesn't yet.)
 2010-08-19 08:45:18 -07:00
Andy2
25e7889c28 checkpoint: add service that's launched at app start and spawns a 
thread that stops itself immediately.  Eventually that thread will
check the relay for pending moves, put up a notification offering to
open the game that has moves pending, and schedule itself to run again
later before stopping itself.
 2010-08-19 07:47:11 -07:00
Andy2
ac022ea5a5 add java version of new crosshairs flags; draw crosshairs 1/3 
width/height of cells instead of reusing focus code to color
background.
 2010-08-11 18:53:12 -07:00
Andy2
d44b08b609 remove unused and confusing duplicate flags. 2010-08-11 18:51:33 -07:00
Andy2
fc603645d1 make changes dialog launchable from About dialog (so reachable other 
than immediately after upgrade)
 2010-08-10 20:33:33 -07:00
Andy2
287ab2485f add changes summary dialog shown on first launch after an upgrade. 2010-08-10 18:48:19 -07:00
Andy2
269bd15a45 change constants for beta 14 2010-08-10 06:12:09 -07:00
Andy2
13596f8538 synchronize read and write of files, fixing a race condition between 
BoardActivity shutdown (save) and GamesList refresh (open) that
resulted in zero-length byte array being passed into the jni.  It's
now possible for the list to win the race and display old data, so a
better solution would be to check-out the file in such a way that the
list couldn't read it until it was update, but at least now we won't
crash.
 2010-07-30 17:40:46 -07:00
Andy2
d07d90761f remove logging 2010-07-30 17:38:07 -07:00
Andy2
b4f7a6917f wrap time in brackets for readability 2010-07-30 07:16:24 -07:00
Andy2
f9afcc0e6f add ability to tag events as UI or not. CMD_DO is not. Only UI 
events in queue prevent engine from continuing.  This fixes bug where
server running engine on behalf of robot would starve the UI thread by
looping forever seeing the engine bail because a CMD_DO was in the
queue and then adding a CMD_DO to try running the engine yet again.
 2010-07-30 06:43:56 -07:00
Andy2
396a277cb4 dispose of progress dialog if it's been shown, even if Activity is 
going away.  This stops runtime complaints about leaking windows.
 2010-07-29 18:11:54 -07:00
Andy2
6be5105eff don't put up progress dialog (from runnable) after activity pauses. 2010-07-29 06:49:30 -07:00
Andy2
d0a632d3ff up version to b13 so can be tagged to match. 2010-07-18 14:40:53 -07:00
Andy2
fb8692fb9f add preference for allowPeek 2010-07-17 07:06:33 -07:00
Andy2
8da9a1e8fa dis/enable shuffle and add-player buttons based on number of players present 2010-07-17 06:03:30 -07:00
Andy2
cd20883df3 draw bonus hint summaries using minimum font height even when cells 
are larger -- keeps from distracting so much from words
 2010-07-17 05:42:50 -07:00
Andy2
2e15650c4d button-based zoom by 4, not 8 2010-07-16 21:01:52 -07:00
Andy2
a99e8142b0 Merge branch 'android_branch' into toolbar 
Conflicts:
	xwords4/android/XWords4/jni/Android.mk
	xwords4/android/XWords4/jni/xwjni.c
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
 2010-07-16 06:32:32 -07:00
Andy2
73980a3c50 use delete button in XWListItem instead of context menu item for DictsActivity too. 2010-07-16 06:19:19 -07:00
Andy2
f9a561bd2a first cut at putting a delete button next to players in config list 2010-07-16 05:50:20 -07:00
eehouse@eehouse.org
ea2b6b6df9 Revert "add util_turnChanged" 
This reverts commit 55d86b15d2.

zoom isn't set up on this branch to go immediately all the way out, so wait for toolbar branch
 2010-07-16 05:19:52 -07:00
Eric House
55d86b15d2 add util_turnChanged 2010-07-15 18:27:00 -07:00
Andy2
f3ffbd94af remove focus-color pref; add crosshairs-color pref in same place 2010-07-14 06:21:55 -07:00
Andy2
55be90dd12 add preference controlling whether bonus "summaries" are shown on top 
of bonus squares.
 2010-07-13 22:39:45 -07:00
Andy2
7176c7036e add localizable "pts" to the in-tray pending score display 2010-07-13 18:57:48 -07:00
Andy2
15f2a46279 fix miniwindow getting erased as soon as drawn. Problem was that 
board code invalidated crosshairs cells in timer callback after
drawing miniwindow but board_draw isn't supposed to get called until
after penup.  But java miniwindow drawing code was pushing DRAW event
to get the canvas updated.  Instead I'm just invalidating the view
which copies the canvas without calling board_draw().
 2010-07-13 18:47:29 -07:00
Andy2
6cb2638a50 if tap-to-play is set, remove play-game item from context menu 2010-07-13 18:09:43 -07:00
Andy2
44907a29a6 cleanup: factor to init in loop from an array 2010-07-13 06:36:33 -07:00
Andy2
d4a23bbaca fix spacing (whitespace only) 2010-07-12 21:42:04 -07:00
Eric House
7352cd5449 fix so bonus strings are in right order 2010-07-12 21:40:40 -07:00
Andy2
e55bb462d9 include bonus square summaries in grey 
Conflicts:

	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
 2010-07-12 21:40:23 -07:00
Andy2
c0819c5a9f up constants for beta 12 2010-07-12 19:16:11 -07:00
Andy2
2f34fc0d35 fix list item not getting updated after its game configuration is changed. 2010-07-12 18:52:11 -07:00
Andy2
de32e514ab cherry-pick three revisions from toolbar branch (d1c7d4097c, f848473c1a and 6484a2fb9b) and manually fix conflicts. 2010-07-12 18:48:03 -07:00
Eric House
8d3ea709e0 add CMD_TOGGLEZOOM so zoom state doesn't have to be maintained 2010-07-11 08:05:23 -07:00
Eric House
546ddf33ae add util_turnChanged 2010-07-10 17:05:17 -07:00
Eric House
177af25617 fix so bonus strings are in right order 2010-07-10 16:54:41 -07:00
Eric House
cedc00c9a6 include bonus square summaries in grey 2010-07-10 16:17:13 -07:00
Andy2
d1c7d4097c remove focus-related code and declarations 2010-07-09 18:52:14 -07:00
Andy2
2bbdcf46c3 make progress dialog cancellable. Still may want to abort the search 
when it's cancelled.
 2010-07-09 06:14:43 -07:00
Andy2
3976738990 put up indeterminate progress dialog when engine starts and at least 
one blank's involved.  Still needs to be made cancellable.
 2010-07-08 18:26:17 -07:00
Andy2
7595b36037 add engineStopping and engineStarting (stubbed out so far) 2010-07-08 07:03:56 -07:00
Andy2
567d5f4d70 add and connect values button. It's visible when there are any tiles 
at all on the board.
 2010-07-08 06:39:48 -07:00
Andy2
40323b03d2 board_canFlip -> board_visTileCount 2010-07-08 06:38:51 -07:00
Andy2
f8d1ebd075 use board_canHint to set hint buttons state so buttons don't show for 
remote or robot players
 2010-07-07 18:48:35 -07:00
Andy2
af2d2c71b5 add board_canHint to jni 2010-07-07 18:47:22 -07:00
Andy2
445f6877b6 fix list item not getting updated after its game configuration is changed. 2010-07-07 18:16:55 -07:00
Andy2
b8c905204e hook up prev hint button -- and finally fix infinite loop that 
happened when you clicked hint while a hint was being calculated.
 2010-07-07 06:51:46 -07:00
Andy2
07940099ed add new param to board_requestHint 2010-07-07 06:49:36 -07:00
Andy2
210a3f033b disable hint buttons when hint feature's turned off 2010-07-05 09:52:19 -07:00
Andy2
b163b45abe Merge branch 'android_branch' into toolbar 
Conflicts:
	xwords4/android/XWords4/AndroidManifest.xml
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/res/xml/xwprefs.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWConstants.java
 2010-07-04 13:28:47 -07:00
Andy2
f0a5fa6034 up version numbers/strings for beta 11 2010-07-04 12:56:59 -07:00
Andy2
dfe1d5f245 break separate menu handling from context-menu stuff so can call from 
onclick handler, then use new preference to decide whether to launch
game or drop context menu on click
 2010-07-04 12:52:36 -07:00
Andy2
ce2182e214 fix crash when copying a new game by testing for null scores array 2010-07-04 12:09:22 -07:00
Andy2
2c2e0b9029 export to jni and use new functions for redoing pending tiles and 
testing whether undo/redo is possible.
 2010-07-03 11:51:27 -07:00
Andy2
e22479ba03 add "play game" item to context menu, and invoke that menu on item 
click.  This fixes problem with users apparently not knowing about
long-tap and context menu and so not knowing they can configure a
game.  Unfortunately I can't figure out how to disable long-tap
also bringing up the context menu.  Yet another preference might be the fix.
 2010-07-02 07:04:37 -07:00
Andy2
9b3463c8e0 use local OnClickListener rather than have Activity implement interface 2010-07-02 06:25:10 -07:00
Andy2
e2925ba50a wire board_canShuffle() to button visibility 2010-07-01 18:57:26 -07:00
Andy2
b5bf895874 let the compiler build the arrays for me 2010-07-01 18:56:41 -07:00
Andy2
6946cbc499 export board_canShuffle via jni 2010-07-01 18:56:18 -07:00
Andy2
0d2ba57186 move more knowledge from Board Activity to Toolbar 2010-07-01 18:45:33 -07:00
Andy2
7895325f74 hook flip button up with board_canFlip result after every draw() call. 
Begin process of moving knowledge of button layout into Toolbar.
 2010-07-01 18:20:53 -07:00
Andy2
2f59836fc4 export board_canFlip 2010-07-01 06:37:22 -07:00
Andy2
650d9f5b45 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into toolbar 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
 2010-07-01 05:54:43 -07:00
Andy2
3b9240ca84 up version strings/numbers 2010-06-30 21:24:17 -07:00
Andy2
cf5f94ffc7 fix crash by providing title id expected by warn-phonies dialog. 2010-06-30 06:31:40 -07:00
Andy2
6a4e9f2c43 up versions in preparation for new release 2010-06-29 21:15:19 -07:00
Eric House
30087845b5 add preference to hide title bar 2010-06-29 19:25:15 -07:00
Andy2
3998a23f84 add undo button; reorder menus; fix show-values menuitem 2010-06-29 18:26:37 -07:00
Andy2
e218cb7639 add prev hint button triggering notImpl; hide title bar. Really want 
to hide it only for landscape orientation, but that seems impossible
without having separate layout and reloading whole activity on
orientation change.  If you hide it after adding content to the
activity you get a runtime exception.  Better way than hiding title,
BTW, is a theme that hides it in AndroidManifest.xml.
 2010-06-29 06:51:45 -07:00
Andy2
d1b2602b42 disable hint button when hints not allowed; cleanup. Still have at 
least one button to add.
 2010-06-28 18:51:41 -07:00
Andy2
375111d0f1 draw blank-marking circle white-on-black for pending tiles -- 
otherwise it's invisible.
 2010-06-28 18:21:53 -07:00
Andy2
6026ad31ba nuke remaining zoom-controller artifact 2010-06-28 06:31:15 -07:00
Andy2
29aa4627e9 get rid of zoom controller. Will be replaced by toolbar button. 2010-06-28 06:29:27 -07:00
Andy2
4b80dedde7 moving toward ImageButtons rather than (text) Buttons, and toward 
having them declared in the layout rather than added at runtime.  Add
temporary references to built-in ImageButtons, and a one-dimentional
one of my own.  Toolbar reduced to handling the orientation change
(and likely to disappear altogether soon.)
 2010-06-27 21:48:01 -07:00
Andy2
5b04bc6382 add zoom button that toggles between zooming in and out 2010-06-27 13:13:30 -07:00
Andy2
85745d8ab4 add more buttons; rearrange menus on assumption those that duplicate 
button functionality can be burried.
 2010-06-26 22:02:02 -07:00