Andy2
416b379781
add second class of socket to be listened on, meant for per-device
...
rather than per-game connection, and when adding connected sockets to
active set track the type.
2010-08-12 06:42:33 -07:00
Andy2
38ed6e4054
add missing close tag
2010-08-11 21:10:10 -07:00
eehouse@eehouse.org
a791b0e53e
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-08-11 20:00:38 -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
2d69d8f2b0
use new crosshairs flags to draw a cross in the middle third of cells
2010-08-11 18:51:09 -07:00
Andy2
09bc83429e
add and set new flags for crosshairs so platforms can do better than
...
fill cells as is done for focus.
2010-08-11 18:50:16 -07:00
Andy2
81ad7719b1
list changes since b13
2010-08-10 21:34:44 -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
e720fe79ab
wrap in ScrollView so can scroll
2010-08-10 20:32:04 -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
205723e03b
add missing event to logging
2010-07-30 17:44:20 -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
eehouse@eehouse.org
3b7abc2a31
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-07-29 21:13:00 -07:00
Eric House
e857b01783
ignore logs and core files
2010-07-29 21:07:20 -07:00
Eric House
d7a3795355
add static decl
2010-07-29 21:04:33 -07:00
Eric House
d7d2a7523b
kill cref when in bad state.
2010-07-29 19:46:52 -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
51d759569a
call srand with current time (attempting to fix what may be duplicate
...
seeds on relay, possible if rand() always starts with same sequence on
different devices in new process); add commented-out logging util_rand
implementation.
2010-07-29 06:53:06 -07:00
Andy2
6be5105eff
don't put up progress dialog (from runnable) after activity pauses.
2010-07-29 06:49:30 -07:00
eehouse@eehouse.org
13ecb2f929
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-07-29 05:41:48 -07:00
Eric House
b170a04dec
drop duplicate [re]connect packets before they enter the state
...
machine. Fixes problems where crefs get stuck in the
XWS_CHK_ALLHERE_2 state. Still should probably kill a cref where
there's no state table entry.
2010-07-28 22:21:01 -07:00
Eric House
f70b9e1d10
use constructor to save some code; no behavior change
2010-07-28 20:17:54 -07:00
Andy2
d67e421541
get rid of excess logging
2010-07-27 21:36:14 -07:00
eehouse@eehouse.org
958ec15a19
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-07-27 21:32:17 -07:00
Eric House
ad1be65236
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-07-27 20:47:42 -07:00
Eric House
b335151172
log when no event pushed while adding players -- this may be how state machine is getting screwed up
2010-07-27 20:47:04 -07:00
Andy2
51ffdce185
comment out pthread_create failure log; seeing it too often and it's
...
just for the web view.
2010-07-26 18:37:44 -07:00
Andy2
9eb424201d
Add credits to About; use style to remove duplicates; credit Sarah.
2010-07-18 19:16:46 -07:00
Andy2
d0a632d3ff
up version to b13 so can be tagged to match.
2010-07-18 14:40:53 -07:00
Andy2
ad1eb053ca
a few final tweaks from Sarah
2010-07-18 14:39:46 -07:00
Andy2
b1f027ce00
latest from Sarah
2010-07-17 21:50:44 -07:00
Andy2
5b3e41f4e9
fix bug: allow switch *to* player whose turn it is even if allowPeek
...
is off (typically because it was turned off after game was loaded and
while non-turn player's tiles are visible)
2010-07-17 07:11:46 -07:00
Andy2
fb8692fb9f
add preference for allowPeek
2010-07-17 07:06:33 -07:00
Andy2
639feb8965
nuke extra line -- change I forgot to save
2010-07-17 06:23:14 -07:00
Andy2
6dc21ae7a8
pass (hard-coded) param controlling non-turn board switching
2010-07-17 06:22:42 -07:00
Andy2
5b8cf716b3
add pref controlling whether can switch to look at tray of user whose
...
turn it isn't
2010-07-17 06:21:24 -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
6ffed8750a
Make delete button smaller and at other end of screen from text.
2010-07-17 05:58:29 -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
eehouse@eehouse.org
f93f6222b2
Merge branch 'android_branch' into toolbar
2010-07-16 21:19:44 -07:00
Andy2
a91c665c45
latest from translator
2010-07-16 21:18:39 -07:00
Andy2
2e15650c4d
button-based zoom by 4, not 8
2010-07-16 21:01:52 -07:00
Andy2
2bf3cbd7e2
turn on CROSSHAIRS -- somehow lost during merge.
2010-07-16 19:18:55 -07:00
Andy2
dbed23e240
change definition of movement during drag to include not just drag of
...
a tile but motion on the board which will include crosshairs. This
prevents miniwindow from coming up and stopping crosshairs movement
when it happened to start on a bonus square.
2010-07-16 18:57:08 -07:00
Andy2
e4feef9bbc
reverse sense of -I since hint region unsupported on Android
2010-07-16 18:24:17 -07:00
Andy2
81694f8392
Sarah's latest icons, converted from .psd using imagemagick
2010-07-16 18:18:37 -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
f05bfcb3d8
log when dropping message that would mess up cref player counts
2010-07-16 06:23:20 -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
Eric House
a52fc5a4fd
don't call removeSocket when none was added
2010-07-15 18:21:32 -07:00
Eric House
8e5abb189b
add mutex for reconns too; log socket and ip addr connecting on it
2010-07-15 18:14:44 -07:00
Eric House
5ea1f3b470
list newest crefs first
2010-07-15 18:13:01 -07:00
Eric House
e2c663622f
ignore dicts
2010-07-15 18:09:40 -07:00
Eric House
78f965b979
replace asserts that have been firing on integrating reconn events
...
with dropping the reconn messages; move log of state table lookup failure
into cref so cref id can be included
2010-07-14 21:32:19 -07:00
eehouse@eehouse.org
f9d8df8cea
don't track xwrelay.conf so local changes don't show as local mods
2010-07-14 06:29:50 -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
f4e0c5f1ad
turn on crosshairs feature
2010-07-13 06:27:07 -07:00
Andy2
a76cdac0c5
don't put up mini window when have penned-down on a draggable tile.
2010-07-13 06:26:55 -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
f2674ed27c
XWFEATURE_RAISETILE is off by default
2010-07-12 19:11:42 -07:00
Andy2
21d705c6e7
make wrap code for popping tile up above cursor hotspot (or finger)
...
conditionally compiled. I probably want it off on Android now that I
have crosshairs.
2010-07-12 19:11:24 -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
0957c95c8e
write and read dummy values to/from stream when KEYBOARD_NAV isn't
...
defined so that the versions are compatible. This will let existing
saved games be read if I turn this off on Android.
2010-07-12 18:49:36 -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
Andy2
19ea138f8e
turn on crosshairs feature, which seems to work
2010-07-12 18:24:41 -07:00
Andy2
fd9464b909
first cut at crosshairs: drawing in focus color the entire column and
...
row that's currently being touched/dragged through. Meant to aid
users of capacitive touch screens in figuring out what cell they're
on.
2010-07-12 06:39:46 -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
d3548aafb2
Make backgrounds transparent. By me: the artist is not to blame. :-)
2010-07-09 23:02:19 -07:00
Andy2
d1c7d4097c
remove focus-related code and declarations
2010-07-09 18:52:14 -07:00
Andy2
8172e38cef
write and read dummy values to/from stream when KEYBOARD_NAV isn't
...
defined so that the versions are compatible. This will let existing
saved games be read if I turn this off on Android.
2010-07-09 18:21:05 -07:00
Andy2
f848473c1a
turn off KEYBOARD_NAV
2010-07-09 06:51:34 -07:00
Andy2
6484a2fb9b
fix to compile (with or without KEYBOARD_NAV undefined)
2010-07-09 06:50:39 -07:00
Andy2
6b9b97231a
fix to compile with KEYBOARD_NAV undefined
2010-07-09 06:49:32 -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
d7110824df
make undo button the last; make vertical and horizontal toolbar
...
orderings the same. (Really should have just one toolbar and set it's
orientation on the fly.)
2010-07-08 18:42:22 -07:00
Andy2
d68d597c49
Sarah Chu's first cut at icons.
2010-07-08 18:41:03 -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
1c218513f1
define SHOW_PROGRESS: when blanks present search takes too long not to
...
show some sort of progress indicator
2010-07-08 07:04:40 -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
Eric House
3716218a1d
ignore files in dawg/
2010-07-07 23:18:14 -07:00
Eric House
48946996b8
ignore file in dawg/
2010-07-07 23:17:13 -07:00
eehouse@eehouse.org
586e0d25f9
Merge branch 'android_branch' into toolbar
2010-07-07 20:44:33 -07:00
Andy2
41f8f574b1
use git describe for version info/stamp
2010-07-07 20:26:25 -07:00
Andy2
5365ea4f4e
fix crash when empty string given on ctrl port
2010-07-07 18:59:48 -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
ac6dc400ce
add board_canHint
2010-07-07 18:47:02 -07:00
Andy2
a2e4fd09c4
add missing apostrophe
2010-07-07 18:27:29 -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
c98451c62a
remove excess logging
2010-07-07 06:50:47 -07:00
Andy2
07940099ed
add new param to board_requestHint
2010-07-07 06:49:36 -07:00
Andy2
a7c77785f6
return false if no move found -- to really fix the crash
2010-07-07 06:40:34 -07:00
Andy2
5725f36db8
detect when no moves found that meet criteria to fix (I think) crash
...
when iterating from highest to lowest move using prevMove.
2010-07-07 06:33:01 -07:00
Andy2
4425ff838c
add buttons (gtk) to test new prev-move feature; modify to fit new api
...
(curses).
2010-07-07 05:29:04 -07:00
Andy2
992f45e1bf
new feature: previous move. Modify engine to traverse the set of all
...
possible moves in either order both within a cached subset and when
building cached subsets. Still a bit buggy (shows the same move twice
when moving backwards and reaches the top-scoring move) and not well
tested.
2010-07-07 05:27:57 -07:00
Andy2
210a3f033b
disable hint buttons when hint feature's turned off
2010-07-05 09:52:19 -07:00
Andy2
93eca7b936
add layout_weight so buttons expand to fill toolbar. I really want
...
available space distributed as space between rather than as wider
buttons but this is an improvement.
2010-07-05 09:47:26 -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
c2aaa04517
move colors editing prefs screen into appearance prefs screen
2010-07-04 12:53:45 -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
6264327d63
formatting change; whitespace only
2010-07-04 12:30:09 -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
3452666231
use board_canTogglePending to disable button
2010-07-03 11:39:10 -07:00
Andy2
5f92491ca3
add and implement board_canTogglePending
2010-07-03 11:38:37 -07:00
Andy2
d44b9907cf
save redoable pending tiles -- and up stream version since format's
...
changed
2010-07-03 11:25:01 -07:00
Andy2
57e246da3b
handle blanks as well in redo of undone pending tiles
2010-07-02 22:44:50 -07:00
Andy2
592d99ba80
add new button and handler to test redo of undone pending moves.
2010-07-02 18:53:37 -07:00
Andy2
f77cf0e23d
add board_redoReplacedTiles and model_redoPendingTiles. The latter
...
works as long as no blanks are involved. And new state isn't being
saved so will be lost unless format changed.
2010-07-02 18:52:55 -07:00
Andy2
5b336146c8
add preference, as yet unused, to control whether tap drops context
...
menu or opens game (as it used to do).
2010-07-02 18:08:22 -07:00
Andy2
4b14e4aeb9
break most top-level prefs into behavior or appearance
2010-07-02 07:14:48 -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
491cfe7616
add board_canShuffle and implement
2010-07-01 18:55:49 -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
e150db29ee
use board_canFlip() to prototype disabling flip button when useless.
2010-06-30 20:25:56 -07:00
Andy2
43c34aa466
add board_canFlip and model_canFlip -- which seem to work though
...
there's no test that when a single tile is on the board it's not in
the middle. Sue me.
2010-06-30 20:25:34 -07:00
Andy2
2b23c50a70
change default phonies key name so upgrading users will still get the
...
new value.
2010-06-30 19:35:18 -07:00
Andy2
769d9a6a23
tweak strings
2010-06-30 06:45:37 -07:00
Andy2
0eab25eec9
make warn-phonies the default. Users are complaining about bogus
...
words being accepted; this may may the feature easier to find.
2010-06-30 06:32:21 -07:00
Andy2
cf5f94ffc7
fix crash by providing title id expected by warn-phonies dialog.
2010-06-30 06:31:40 -07:00
Andy2
b83867ff13
Configure -> Game settings
2010-06-30 06:16:23 -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
45b5bef414
new prev_hint button with left-facing arrow
2010-06-29 06:48:20 -07:00
Andy2
953b2bcc55
cleanup; allow setting NUM_SAVED_ENGINE_MOVES per-platform
2010-06-28 21:08:13 -07:00
Andy2
c9dd0c2ddf
use my dummy icons instead of irrelevant builtins
2010-06-28 18:52:20 -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
cf0c7c9770
"First hint" replaces "Hint" for, I hope, more clarity
2010-06-28 18:49:42 -07:00
Andy2
99d41083bd
xml file not needed now that buttons are declared as part of board
2010-06-28 18:48:16 -07:00
Andy2
521852ddf5
more proof-of-concept icons
2010-06-28 18:47:47 -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
85679dcb2a
(re)add padding on sides and at top
2010-06-28 06:26:49 -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
0c852981e7
make zoomBy param passed to board_zoom give distance rather than just
...
direction.
2010-06-27 13:12: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
06a7c56ca9
template for toolbar buttons.
2010-06-26 17:53:00 -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
1c910d5169
turn off debugging so device builds can be from unmodified source.
2010-06-26 12:40:04 -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
3e9c94118a
put toolbars at right and bottom. Next step is to hide the one we
...
don't want.
2010-06-25 20:14:15 -07:00
Andy2
1866c5ccab
add toolbar at bottom to test spacing
2010-06-25 08:14:18 -07:00
Andy2
7b52f36925
remove unused string
2010-06-25 08:05:07 -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
10286e0109
explicit mention in about text that it's FOSS
2010-06-21 07:55: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
8d01060599
gitignores for wince
2010-06-20 22:58:59 -07:00
Eric House
3be95e5d7e
up version string and code
2010-06-20 10:02:53 -07:00
Eric House
f1eecd78fa
nuke debugging echo
2010-06-20 09:31:21 -07:00
Eric House
3d22d9e1b0
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-06-20 09:29:45 -07:00
Eric House
d5eca2027a
remove local.properties, and add a script, run from build.xml before
...
local.properties is loaded, to generate it with a path to sdk
appropriate to the installation.
2010-06-20 09:29:13 -07:00
andy
ddc1d419b2
nuke CVSROOT
2010-06-20 09:23:33 -07:00
eehouse@eehouse.org
1fdf1e1a41
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-06-17 20:40:13 -07:00
Eric House
a6b4e424ba
Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch
2010-06-17 20:36:25 -07:00
Eric House
afb3f4040a
fix to compile in non-debug mode
2010-06-17 20:35:54 -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
80aa22b2d1
add common prefs field sortNewTiles and way to set on linux cmdline
2010-06-17 18:10:32 -07:00
Andy2
e0dd3701a0
Add model_sortTiles(); use it; fix some comments and const decls.
...
Sorting always happens now when tiles added; needs to be based on a
preference.
2010-06-17 06:43:16 -07:00
Andy2
529f3df726
fix seekbar style so thumb's fully visible on 2.1 (was ok on 1.6); and
...
rename style for clarity.
2010-06-16 18:44:19 -07:00
Andy2
660d86c121
menuitem text change
2010-06-16 18:33:08 -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
448cb63891
remove TODO
2010-06-16 18:26:37 -07:00
Andy2
66f4b0d2f6
forgot to add this earlier and git didn't complain...
2010-06-16 18:07:01 -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
ca2aa982a7
update from translator
2010-06-14 18:18:17 -07:00
Andy2
375789cd02
juggle->shuffle; trade->exchange. Strings only; no code change.
2010-06-13 20:40:12 -07:00
Andy2
ccce9ca85d
incorporate output of 'git describe' in name of .apk file produced
2010-06-10 22:43:11 -07:00
Andy2
74c9e9db92
add second prefs menu to restore all prefs
2010-06-10 21:28:38 -07:00
Andy2
57b74391bc
remove duplicates that the compiler missed at first
2010-06-10 21:27:17 -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
f7c737bcde
latest from translator
2010-06-10 19:27:14 -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
Andy2
e727fa7a03
first cut at Slovak from translator
2010-06-08 22:06:18 -07:00
Andy2
aa825bf662
fix for new location. Need to get this out of git somehow.
2010-06-07 06:11:11 -07:00
Andy2
cb5763312d
can't use svnversion for file name any more
2010-06-07 05:50:01 -07:00
Andy2
ab167f51f4
can't use svnversion for file name any more
2010-06-07 05:48:25 -07:00
Andy2
d99241ccbc
accomodate API changes
2010-06-07 05:45:37 -07:00
Eric House
d7d162d474
rearrange menus, promoting undo and hint and demoting flip and turndone
2010-06-06 13:33:19 -07:00
Eric House
34ecac303a
make optional and then turn off feature whereby tap in empty part of
...
tray undoes current move. It's too easy to hit this on a capacitive
display.
2010-06-06 13:32:12 -07:00
Eric House
94b3e16b7b
add versioning codes required by market; up beta so they match.
2010-06-06 09:04:08 -07:00
eehouse@eehouse.org
db2c36eda9
add string
2010-06-06 06:41:45 -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
c897aefb7e
quick uninstall script since I can't remember the syntax
2010-06-05 10:43:03 -07:00
Eric House
f9518d5a87
try pushing and popping any local changes around the build tag checkout
2010-06-05 10:29:22 -07:00
Eric House
e015bf81d1
add --tag option that causes to build from the tagged tree. Will
...
currently use tagname in about box only if there are no uncommitted
local revisions. git stash might fix this. Also need either to use
user-friendly tag names or provide them as alternatives here.
2010-06-05 10:17:53 -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
cbdf32724a
move .gitignore up to cover the whole tree
2010-06-05 09:08:36 -07:00
Eric House
564dfff2c0
rename generated class SvnVersion->GitVersion
2010-06-05 08:30:55 -07:00
Eric House
e10778b2f3
put result of 'git describe --always' into the about box for now.
...
Later will be using tagname if present.
2010-06-05 08:24:43 -07:00
Eric House
f5e8283869
ignore core files
2010-06-05 08:23:52 -07:00
Eric House
08ad0bdfa5
fix assertion failure by passing max size not < actual size
2010-06-05 08:10:02 -07:00
Eric House
d98b2ad5d6
make git version available as a read-only advanced preference. I sure
...
hope I never need to ask a user to transcribe this!
2010-06-05 07:55:40 -07:00
Eric House
cbbaeb57a0
gitignore additions
2010-06-05 07:50:09 -07:00
Eric House
6456165a92
replace svnversion with gitversion.sh
2010-06-05 07:27:14 -07:00
Eric House
8aaaa06bcb
identify rev number as from git
2010-06-05 07:25:24 -07:00
Eric House
21fef0ded8
script to replace, eventually if I'm lucky, svnversion as a way to
...
mark a build's source.
2010-06-05 07:20:49 -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
f514717428
Change board_zoom to indicate direction only of zoom, not number of
...
cols. When figuring internal dimensions zoom out as needed to meet
maxSize value. This fixes problem where rotating a zoomed portrait
board to landscape leaves cells bigger than they can be made by
zooming, but then the desired zoom has been changed and stored and so
on return to portrait cells are smaller/less zoomed. Need to see if I
can live with that.
2010-06-05 03:40:23 +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
ea6166f8c7
add comms_resetSame that resets relay with existing params.
2010-06-05 03:39:16 +00:00
eehouse
a80d874e9d
change api for board_zoom and change callers. No effect on java and
...
no behavior change.
2010-06-05 03:39:06 +00:00
eehouse
9af9df884b
use same logic to decide to zoom and to report whether can zoom next
...
time. Fixes bug preventing + button from greying out when fully
zoomed in.
2010-06-05 03:38:49 +00:00
eehouse
a2d2b0adbd
quick hack to enable/disable zoom buttons so can debug board.c w/out
...
android.
2010-06-05 03:38:40 +00:00
eehouse
1f246d20a3
oops. Fix assertion by not stopping dragging unless it's been
...
started.
2010-06-04 03:47:56 +00:00
eehouse
57013a9267
stop dragging before putting up miniwindow. This allows to drag
...
finger off of bonus hint just displayed without scrolling the screen.
2010-06-04 03:47:46 +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
e1d956ac09
catch up with board_setPos API change.
2010-06-03 04:58:02 +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
628f8d9cf3
don't zoom in if doing so will make cells larger than the limit passed
...
in.
2010-06-03 04:57:11 +00:00
ehouse
43181f5cd2
accept multiple cref ids and names on console
2010-06-03 03:00:35 +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
4f16eee1b6
pass maxCellSize into board_setPos, and use it as limit in calculating
...
whether any further zooming is possible.
2010-06-02 04:58:32 +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
8bb2fb9b09
track and display in web view the number of games actually joined
...
rather than the number attempted.
2010-05-28 02:31:27 +00:00
eehouse
f5ac51ae73
fix crash using older dict by using current stream version rather than
...
one from before gameSeconds was being preserved in the stream by
write_gi code. I fixed this on a branch a week ago as well, so look
for a merge glitch. Need now to confirm that I'm sending char lists
in initial connect message in the right (null-separated utf8) format.
2010-05-28 02:31:13 +00:00
eehouse
92e02c9c2e
catch up with API changes
2010-05-28 02:31:04 +00:00
eehouse
0d7b09cb01
revert 3407; deleted a string I needed
2010-05-27 12:52:48 +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
6b9c4a4e0f
shorten pattern to include multi-line elements (I should use
...
xmlstarlet here but need to grok xslt); don't report as missing
strings in the common file
2010-05-27 02:58:08 +00:00
eehouse
cc984f02ab
remove unused string
2010-05-27 02:57:57 +00:00
eehouse
282f9ce237
wrap in scrollview so still usable in landscape orientation
2010-05-27 02:57:46 +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
8e06ff446a
Preferences->Settings; remove duplicated strings.
2010-05-27 02:56:54 +00:00
eehouse
2449962185
add icons to the games list activity menu, three built-in and one with
...
a CC license.
2010-05-27 02:56:36 +00:00
eehouse
b345938e03
dictionary icon adapted from http://icons2.iconarchive.com/icons/mattahan/buuf/48/Dictionary-icon.png using gimp. Original by Mattahan (Paul Davey) license: CC Attribution-Noncommercial-Share Alike 3.0
2010-05-27 02:56:24 +00:00
eehouse
695c5736e5
fix default phonies value; improve some strings related to default timer
2010-05-26 02:51:15 +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
c92d919934
log error from read
2010-05-26 02:25:58 +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
84f76a8c9a
Add a summary visible before default dict has been set directing user
...
on how to change it. Goes away when it becomes possible to set
directly in prefs activity.
2010-05-20 04:28:53 +00:00
eehouse
1054ba5341
don't replace summary with empty value
2010-05-20 04:28:38 +00:00
eehouse
1ea06352dc
latest from translator
2010-05-20 04:28:20 +00:00
eehouse
7a279702c0
add sterrror to what's logged when pthread_create fails -- as is
...
happening often.
2010-05-20 04:28:07 +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
a76fd7b87a
contributed icon
2010-05-18 02:33:16 +00:00
ehouse
b38fa6c62e
latest from translator (plus my shot at playerf)
2010-05-18 02:31:09 +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
4f8c7b3cb8
trying again with the right params to iconv
2010-05-15 03:07:51 +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
4ce0a30b2d
save gameSeconds even if timer not enabled. Means stream version change.
2010-05-14 12:42:53 +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
c9ca99d3f0
convert (with iconv) to utf8
2010-05-13 04:20:20 +00:00
eehouse
8f0cae4bf2
czech strings as received from translator
2010-05-13 04:16:30 +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
4da3edabbb
draw_scoreBegin now returns a boolean
2010-05-12 11:51:55 +00:00
eehouse
c79b3e2395
make draw_scoreBegin return a boolean like the other two draw_*Begin
...
methods
2010-05-12 11:51:14 +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
1e560bfd42
move the download-url string into non-localizable strings
2010-05-12 11:48:33 +00:00
eehouse
5617533403
up beta version
2010-05-12 11:47:49 +00:00
eehouse
bfee36bf56
add minSdkVersion and targetSdkVersion
2010-05-12 11:47:22 +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
eehouse
922a32ad08
remove per-packet logging
2010-05-08 19:29:36 +00:00
eehouse
8e6c3c7533
Fix problem with entries in summary db outlasting their games and
...
getting applied to new games created with old name: add deleteGame
method that removes summary and file at same time.
2010-05-08 19:29:20 +00:00
eehouse
5542350094
comment out Hidden games menuitem; rearrange menuitems; fix missing
...
string that compiler didn't notice earlier.
2010-05-08 19:29:03 +00:00
eehouse
e3b77aa1f1
add dialog confirming delete_all menu
2010-05-08 19:28:38 +00:00
eehouse
cfbdfac10b
get and save new summary in resetGame so connected games don't show in
...
gameslist as unconnected after being reset or copied.
2010-05-08 19:28:19 +00:00
eehouse
87f5aada74
dereference array inside try to catch oob exception I just saw but
...
whose cause I can't find as well as null array I was previously
testing for.
2010-05-08 15:54:30 +00:00
eehouse
9d86ba9a99
add timestamp fields to DB as long as the format's changing
2010-05-08 15:30:22 +00:00
eehouse
0e3411ecd4
modify configure connection button to reflect conn type chosen; add
...
role-specifig hints to relay config dialog (in a way it'll be easy to
follow for others.)
2010-05-08 15:27:32 +00:00
eehouse
13ab9b233d
comment out sms code; class fails verifier on 1.5 device.
2010-05-08 15:27:06 +00:00
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
eehouse
603462fc33
add option to skip modal dialog showing final game score (may prevent
...
curses version from becoming nonresponsive when used from playme.sh);
add menu command to curses version to resend messages.
2010-03-28 16:08:54 +00:00
eehouse
13b46297e0
Separate life of socket from that of selector: close socket if must
...
but don't exit the thread and be ready to reopen. Fixes bug where
wouldn't reconnect to relay if died and then came back.
2010-03-25 04:53:44 +00:00
eehouse
cb5cc975b3
add new params required for comms_getInitialAddr
2010-03-25 04:53:16 +00:00
eehouse
f71430dc27
better logging of outgoing sms -- which still doesn't work in emulator
...
after new tools released.
2010-03-25 04:52:58 +00:00
eehouse
f430a84d75
add comms_transportFailed, and call when relay goes down. This makes
...
icon change correctly and comms start trying to reconnect, but the
loop in CommsTransport can't be restarted yet.
2010-03-25 04:51:55 +00:00
eehouse
55abf1116b
get relay port from prefs and pass into jni
2010-03-25 04:50:19 +00:00
eehouse
077bc53e80
go back to having Ok and Cancel buttons: that's the way the built-in
...
prefs editors work. Dismiss == Cancel, again following the built-in.
2010-03-25 04:48:03 +00:00
eehouse
02a96cdaa6
remove ability to edit host and port when configuring relay. Must use
...
prefs/advanced.
2010-03-21 03:13:16 +00:00
eehouse
786541e9ae
pass default hostname in from platform code rather than compiling it
...
into jni; in java pull it from preferences and pass into jni.
2010-03-21 03:12:58 +00:00
eehouse
a32975362a
increase text of color labels -- but they should really be white.
2010-03-21 03:12:38 +00:00
eehouse
815ac74ebe
change color prefs key names so won't crash opening older db
2010-03-21 03:12:28 +00:00
eehouse
19f6ec62db
add a color sample above the RGB sliders so changes appear in real
...
time.
2010-03-21 03:12:17 +00:00
eehouse
d68038b18b
Remove ok button from color editor; when cancel chosen don't save changes.
2010-03-21 03:12:02 +00:00
eehouse
9466203844
use sliders instead of text fields for editing of colors, and store
...
them as ints. This will probably cause older versions to crash. Need
either to change the names of keys or warn with next release.
2010-03-21 03:11:49 +00:00
eehouse
b20296fbd2
First cut at a color prefs editor.
2010-03-21 03:11:29 +00:00
eehouse
e05b31585d
get rid of logging
2010-03-21 03:11:09 +00:00
eehouse
a5c3fa5f59
don't pass empty stream to comms_send: this fixes a problem where
...
client code calls server_initClientConnection when the game's already
been started and empty messages get queued up. Ideally the call
wouldn't happen but I'm not sure how to test if a game's begun.
server's doing the right thing not putting anything in the message.
2010-03-21 03:10:56 +00:00
eehouse
5806aa0aca
get rid of excess logging
2010-03-21 03:10:47 +00:00
eehouse
0b7eee672a
do something for -S on curses version too
2010-03-21 03:10:36 +00:00
eehouse
b3a4ac306e
actually do something (on the gtk side at least) when -S param is
...
passed.
2010-03-21 03:10:29 +00:00