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

726 commits

Author SHA1 Message Date
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