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
Andy2
ad2fce6519
remove built-in buttons from board.xml; add addButton method on
...
Toolbar and call it from BoardActivity to produce a working hint
button. Am using text labels instead of icons for now.
2010-06-26 17:52:36 -07:00
Andy2
6536699dd5
remove unused import
2010-06-26 17:49:23 -07:00
Andy2
29ba0cf4f2
add Toolbar class and use it to hide whichever toolbar isn't wanted in
...
the current screen orientation.
2010-06-26 12:39:10 -07:00
Andy2
05a208594c
cache games list item views in hashmap by file path, and inval
...
individual items when their views need to change. This seems to
significantly speed [re]rendering the list.
2010-06-25 06:38:00 -07:00
Andy2
8012cbdcd6
beta 8 since b7 was in the about box for prev (first) Market release.
2010-06-21 07:17:44 -07:00
Andy2
12cc45617e
don't use query title for informative dialogs reporting robot actions.
2010-06-17 18:56:51 -07:00
Andy2
38ef891268
new preference, on by default, controlling sorting of new tray tiles.
2010-06-17 18:51:46 -07:00
Andy2
adfb4d7a6a
bug: wasn't passing changed prefs to server, only to board. So rather
...
than export server_prefsChanged via jni replace board_prefsChanged
with a new method that calls both.
2010-06-17 18:51:10 -07:00
Andy2
df3ab84b80
shrink rem and timer text to a size between cur player and remaining
...
players. Looks better not so huge.
2010-06-16 18:30:27 -07:00
Andy2
95056db997
change meaning of timer setting to be per-player rather than per-game
...
based on information that that's how it's customarily done. Will need
to communicate change with translators.
2010-06-16 06:39:27 -07:00
Andy2
78ad2feed9
rename static variable appropriately
2010-06-14 18:23:18 -07:00
Andy2
391982f16f
synchronize saveSummary and getSummary. They can be called from
...
different threads and that may be the cause of a few crashes I've seen
and had reported.
2010-06-14 18:21:12 -07:00
Andy2
74c9e9db92
add second prefs menu to restore all prefs
2010-06-10 21:28:38 -07:00
Andy2
f9fbe386f5
add menu and menuitem to prefs dialog (shows up for main screen only)
...
to reset colors to defaults
2010-06-10 21:10:06 -07:00
Andy2
222f30b5ac
hide zoom buttons when laying out board in case they're visible and
...
we're switching to landscape.
2010-06-08 22:55:40 -07:00
Andy2
7b897acfc1
don't put up zoom control in landscape mode. There just isn't room
...
and it in effect disables the tray. Rather, think of landscape as
zoomed mode: no zooming necessary. Volume controls still zoom if
enabled.
2010-06-08 22:40:17 -07:00
Eric House
94b3e16b7b
add versioning codes required by market; up beta so they match.
2010-06-06 09:04:08 -07:00
Eric House
e42404a8a6
Allow tray to be shorter when scrolling will be required.
2010-06-05 14:10:29 -07:00
Eric House
d3eb3233a3
up version string to b6 -- to have something different from tag to work with
2010-06-05 09:22:02 -07:00
Eric House
564dfff2c0
rename generated class SvnVersion->GitVersion
2010-06-05 08:30:55 -07:00
Eric House
d91f3de9a9
again: replace use of dead constant with numerals. git is a pain...
2010-06-04 23:37:16 -07:00
eehouse
ca968d8294
pass only -1 or 1 into board_zoom
2010-06-05 03:40:43 +00:00
eehouse
d0b9f0f7aa
add Retry button to dialog announcing client failure to find expected
...
room on relay. From handler call new comms_resetSame and existing
code to init client game connecion.
2010-06-05 03:40:09 +00:00
eehouse
9f797afe73
export comms_resetSame through jni
2010-06-05 03:39:38 +00:00
eehouse
9b81a668ad
move System.loadLibrary("xwjni"); to XwJNI.java which is certain to
...
always be loaded before any jni call is made. Fixes -- I hope --
occasional UnsatisfiedLinkError happening on-device.
2010-06-04 03:47:37 +00:00
eehouse
33a1efd725
save after every network event when running in background
2010-06-04 03:47:22 +00:00
eehouse
a3926f42ff
move game save into jnithread so it can be synchronized with other
...
activities accessing the jni, then do it once in onPause and again in
onDestroy before closing the game. Network activities are probably
the only things that can change the game state after onPause is
called, so they'll probably want to be followed by SAVE commands.
2010-06-03 04:57:46 +00:00
eehouse
7b33455799
move game-close logic from onPause to onDestroy. Makes for much
...
faster resume and seems ok. But need to do some saving in onPause so
no data's lost if we're killed without onDestroy getting called.
2010-06-03 04:57:27 +00:00
eehouse
0920eeb6b3
set default font height based on scale rather than assuming Paint's
...
defaults make sense.
2010-06-02 12:46:08 +00:00
eehouse
bcac60b2d4
don't display zoom control at all if both buttons disabled.
2010-06-02 04:59:51 +00:00
eehouse
68bf571f26
figure maxCellSize and pass to jni; call after doing layout to
...
correctly get whether zooming is possible.
2010-06-02 04:59:34 +00:00
eehouse
048e854d4e
no point in triggering a zoom call meant to get state before layout's
...
been done.
2010-06-02 04:59:14 +00:00
eehouse
c7bedc297c
include new param to board_zoom
2010-06-02 04:58:53 +00:00
eehouse
4fe36455c6
Add upper bound on cell size yielding left and right margins for
...
super-wide screens.
2010-06-02 04:58:20 +00:00
ehouse
69cb7bce15
up release to b5
2010-06-01 02:50:11 +00:00
eehouse
a8e705dcc8
mark blanks with a circle around it rather than rects in the corners
2010-05-28 02:31:46 +00:00
eehouse
4b7dad5f5c
fix jni reentrancy problem when onPause called while a blocking dialog
...
is up. The fix is to track if there's a thread blocked and to
interrupt it so it can return through the jni as if the dialog were
cancelled. More explanation in comments part of this checkin.
2010-05-27 02:58:56 +00:00
eehouse
b54ffe2b7d
robot move/trade report dialogs need to block in case the next player
...
is also a robot
2010-05-27 02:58:42 +00:00
eehouse
c5a0384d79
include name of game in title of game-configure screen
2010-05-27 02:58:27 +00:00
eehouse
4be4a8156a
wire new edittext to seekbar and vice-versa, including hack boolean to
...
prevent loop that resets the cursor to the 0 position on every
keystroke.
2010-05-27 02:57:35 +00:00
eehouse
8c790edd04
add numerical edittexts to left of seekers in color edit view. Not
...
yet wired up but layout's ok
2010-05-27 02:57:21 +00:00
eehouse
dd2693bab0
factor out common code
2010-05-26 02:27:34 +00:00
eehouse
28d9d4559d
add new-game/default prefs for phonies and timer_enabled
2010-05-26 02:27:16 +00:00
eehouse
ec57cbcf1b
actually hide the delete menuitem for builtin dicts; greyed out is too
...
subtle.
2010-05-26 02:26:44 +00:00
eehouse
da7c59a869
subclass ListPreference in order to provide a list of dicts at runtime
...
for setting the default. Remove the hint that says "do it on dicts
screen."
2010-05-26 02:26:24 +00:00
eehouse
42a4a19911
disable delete menuitem when dicts are builtin (since can't be deleted)
2010-05-20 04:29:29 +00:00
eehouse
70f0a5fe90
fix dict deletion (which broke when extension removed from
...
user-visible name)
2010-05-20 04:29:10 +00:00
eehouse
1054ba5341
don't replace summary with empty value
2010-05-20 04:28:38 +00:00
eehouse
3863279013
divider follows last item too on real lists; add spacing above and below it.
2010-05-20 04:27:56 +00:00
eehouse
7913292942
get "Player 1" etc from a resource; don't hard-code!
2010-05-18 02:27:34 +00:00
eehouse
f3f350a12d
Create new prefs screen with per-game defaults, adding existing and
...
new for dicts; use dict pref when creating new game; add menuitem to
dicts view to set that pref. I want to launch the dicts activity from
the preference instead (which is information-only right now) but can't
figure out how to do startActivityForResult from a Preference....
2010-05-18 02:27:14 +00:00
eehouse
40c25d6137
add initial/default value of gameSeconds as a preference and honor it
...
when creating and copying CurGameInfo instances.
2010-05-14 12:43:17 +00:00
eehouse
bbfa375dfe
erase cached tile rects when doing layout to fix bug where tile
...
letters are partially offtile when a game first opened game in
landscape changes to portrait mode.
2010-05-14 12:42:44 +00:00
eehouse
95460e1685
Draw score entries for players whose turn it isn't in two lines so you
...
can still see the name.
2010-05-14 12:42:28 +00:00
eehouse
71e65433d3
figure board dimensions in one place rather than two, then share.
2010-05-12 11:59:40 +00:00
eehouse
51f3412567
Break game- and dict-related static methods from Utils into new GameUtils
2010-05-12 11:58:37 +00:00
eehouse
c85b033ced
Break db-related static methods from Utils into new DBUtils
2010-05-12 11:57:07 +00:00
eehouse
24c1527232
fix yOffsetChanged to follow new API, but still leave commented out;
...
set game file name from resource, and make visible in board title and
as part of games list entries.
2010-05-12 11:56:01 +00:00
eehouse
6bbf7f32dd
don't store Context as a class variable in CommonPrefs. Instead, pass
...
it into every method where it's needed. This should fix occasional
crash where the OS relaunches me into an activity that uses prefs
without passing through the GamesListActivity where that static was
getting set.
2010-05-12 11:54:36 +00:00
eehouse
f154e83a21
draw_scoreBegin now returns a boolean
2010-05-12 11:53:06 +00:00
eehouse
7faaed04f5
remove .xwd from dict names displayed to users.
2010-05-12 11:50:25 +00:00
eehouse
7daa6e33f7
Make first player a robot rather than second. This might make a
...
better first impression on new users.
2010-05-12 11:49:38 +00:00
eehouse
5617533403
up beta version
2010-05-12 11:47:49 +00:00
eehouse
772291ea73
add hour to timestamp
2010-05-09 20:40:55 +00:00
eehouse
3159e864b5
add onResume to undo effects of onPause. I'm pretty sure this fixes
...
the white screen on device bug.
2010-05-09 20:40:39 +00:00
eehouse
77f21c6f2e
try passing application context to CommonPrefs. I'm getting a crash
...
on device when app's been running for a while and, perhaps, the
original GamesList activity has been recycled but CommonPrefs instance
with its static has not. The BoardView is being recreated and
CommonPrefs asserts that m_context is null. That shouldn't be
possible, but we'll try this.
2010-05-09 14:42:19 +00:00
eehouse
8f207615e3
remove logging
2010-05-09 14:42:02 +00:00
eehouse
d708365843
add a bit more activity lifecycle logging, and invalidate view when
...
not building it on resuming/restarting/starting
2010-05-08 19:29:54 +00:00