Commit graph

880 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Andy2
19ea138f8e turn on crosshairs feature, which seems to work 2010-07-12 18:24:41 -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
f848473c1a turn off KEYBOARD_NAV 2010-07-09 06:51:34 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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