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

2122 commits

Author SHA1 Message Date
Eric House
8be57116ab revert previous change: the right way to save selections is to add 
screenSize to the list of changes handled so that Activities aren't
recreated each time, so do that instead.
 2013-11-21 07:34:38 -08:00
Eric House
03b7a6d45f preserve selection across orientation changes 2013-11-21 07:10:36 -08:00
Eric House
75d9752024 use "pct." to indicate what thumb scale choices mean. '%' triggers a 
known crasher in Android.
 2013-11-21 06:44:19 -08:00
Eric House
7be3a3bef8 express thumb size as percent of screen with options, generated, in 5% 
increments.
 2013-11-21 06:27:09 -08:00
Eric House
b874406b7b add newbie message about how NFC works 2013-11-21 05:53:38 -08:00
Eric House
c42271ee31 fix NPE 2013-11-21 05:26:45 -08:00
Eric House
08205637de disable SMS play/invite on KitKat (until workarounds found) 2013-11-21 05:26:12 -08:00
Eric House
24e015f259 don't make snapshots for non-expanded game list items; make when first 
expanded instead.
 2013-11-20 08:15:18 -08:00
Eric House
2e5e10ef6d move dialog asking to enable NFC into NFCUtils, and use it when 
creating a new game to be invited via (disabled) NFC
 2013-11-20 07:56:05 -08:00
Eric House
b1ae563ae6 fix NPE when installed with existing SMS invites in inbox 2013-11-20 06:54:51 -08:00
Eric House
51a561077c when action-bar-equipped device tries to hide title bar warn and then 
disable pref.
 2013-11-19 07:22:14 -08:00
Eric House
63ba7d45d3 use gameID as inviteID for non-NFC invites too 2013-11-19 06:37:39 -08:00
Eric House
0cef5fce50 display gameid as hex 2013-11-19 06:26:07 -08:00
Eric House
45fcd19e6e use gameID as inviteID, so that all devices in a game will be using 
the same gameID -- and use that to reject as duplicates attempts to
use the same invitation more than once.
 2013-11-18 21:38:59 -08:00
Eric House
d7239323bc add gameid as option for what's shown in summary (debug only) 2013-11-18 07:25:40 -08:00
Eric House
6d06197c45 hide trade menuitem when board's in invite mode 2013-11-18 06:48:12 -08:00
Eric House
7ff9496d23 remove some logging 2013-11-18 06:33:59 -08:00
Eric House
03f532374b put up NFC button even if turned off, and when it's used offer to turn 
it on.
 2013-11-18 06:27:24 -08:00
Eric House
3278b55819 return whether NFC *can* be enabled as well as whether it is 2013-11-17 21:21:06 -08:00
Eric House
0cc45ad865 add new field canHideRack to GameStateInfo and use it to disable menu. 2013-11-17 13:54:21 -08:00
Eric House
0bf28c133d always have board ready to send invite via NFC 2013-11-16 09:03:17 -08:00
Eric House
deff81cfd1 move query setup outside of synchronized blocks where possible 2013-11-16 06:30:34 -08:00
Eric House
f303fa2653 debug features and logging are always on/available for debug builds 2013-11-15 20:52:05 -08:00
Eric House
088dd1bd75 center board when it must be narrower than screen 2013-11-15 20:46:22 -08:00
Eric House
c0f6f6a959 don't enable delete menu when default group is among those selected 2013-11-15 19:14:51 -08:00
Eric House
e4e0f57676 put up different help text depending on whether user has buttons or 
menus (since the text mentions them)
 2013-11-15 19:02:13 -08:00
Eric House
d8ea672f6c now that getDefaultNewGameGroup works, allow/pass undefined group 
further down where appropriate
 2013-11-15 07:53:57 -08:00
Eric House
cd922ba8e2 fix getDefaultNewGameGroup to use a (new) DBUtils method that actually 
works.
 2013-11-15 07:47:14 -08:00
Eric House
3ba470573d when there's no default new-game group, get *some* group from the DB 
and make that the default, with caution to avoid any -1==groupID games
saved by previous buggy versions
 2013-11-15 06:50:34 -08:00
Eric House
edadc962f8 rename generated file; set logging on by default for debug builds 2013-11-14 21:56:37 -08:00
Eric House
53748e352a fix games created after reset of prefs from disappearing: they were 
being saved with groupid of -1, so now when the default's not been sit
choose and pass in the first group.
 2013-11-14 21:47:01 -08:00
Eric House
5826f080be don't hide titlebar for board if there's no menu key, since on such 
devices there's no other way to get to the menu.
 2013-11-14 08:07:00 -08:00
Eric House
85a533c74f use interface trick to avoid NFC code crashing on 2.1 2013-11-14 08:03:28 -08:00
Eric House
bdf5a43686 always update nMissing so invite menuitem can go away 2013-11-14 06:19:04 -08:00
Eric House
e20a72e527 remove and turn off active rect stuff 2013-11-14 05:59:51 -08:00
Eric House
4d6a37b048 don't force NFC messages to ascii -- it breaks special chars and isn't 
required, even with special chars.
 2013-11-14 05:46:47 -08:00
Eric House
e9bdf3c4f8 don't show trade buttons when have actionbar since they're redundant 
and the AB icons are visible; hide resign menuitem when in trade mode.
 2013-11-13 19:00:34 -08:00
Eric House
3b5bc3a786 fix OOB per http://stackoverflow.com/questions/12133404/indexoutofboundsexception-in-a-baseexpandablelistadapter-implementing-sectionind 2013-11-13 18:39:03 -08:00
Eric House
263a4d7170 move action bar stuff into its own class; in wordlist browser, show 
only one of download button and download menu
 2013-11-13 07:42:51 -08:00
Eric House
41f61e3748 use setNdefPushMessageCallback instead of setNdefPushMessage; seems to 
make invitations work more reliably.
 2013-11-13 07:11:56 -08:00
Eric House
3b3746d2e5 fix invites dialog to show the right buttons for all cases. 2013-11-13 06:52:45 -08:00
Eric House
d119033333 use resource strings and apis rather than quoted strings for nfc constants 2013-11-13 06:51:36 -08:00
Eric House
735e42cd90 launch on tap even if selected 2013-11-13 06:50:30 -08:00
Eric House
b7d756957c test also whether NFC turned on 2013-11-12 19:12:47 -08:00
Eric House
b3bc738cae move nfc stuff into separate utility class, and check API version for 
whether to support it. Oddly the app runs on 2.1 emulator without
classnotfound error -- I was expecting to have to use the interface trick.
 2013-11-12 19:06:26 -08:00
Eric House
f291ef7377 remove dup import 2013-11-12 18:58:13 -08:00
Eric House
e63e5b6102 Merge branch 'android_branch' into android_nfc 2013-11-12 18:39:31 -08:00
Eric House
8704efd38e add send-invites menuitem that's at top of board menu but only visible 
when game's unconnected
 2013-11-12 18:39:13 -08:00
Eric House
e040aa388b don't try to save to read-only lock; check for non-existant games when 
summarizing: together these fix crash when deleting after opening game
whose remote partner has been deleted.
 2013-11-12 08:08:30 -08:00
Eric House
6719704117 remove excessive logging 2013-11-12 08:02:14 -08:00
Eric House
10608b137f Mark the current player's wordlist in wordlists popup 2013-11-12 07:05:37 -08:00
Eric House
e2aea4a39e call through to canvas for current score to correctly update menu 2013-11-12 06:40:40 -08:00
Eric House
f14be36bbc eliminate flicker on opening board: don't start drawing tile if can't 
finish
 2013-11-12 06:34:56 -08:00
Eric House
282b32396f don't log the one command that's supposed to get posted post-stop 2013-11-12 06:29:57 -08:00
Eric House
d0313d3c4b package game-start data into a json and send it via nfc, then open it 
on the other end. Works to start a game!
 2013-11-11 22:06:28 -08:00
Eric House
a88835a4a1 Successfully send text via NFC and log it on receiver 2013-11-11 21:36:19 -08:00
Eric House
98989abb14 don't log the one command that's supposed to get posted post-stop 2013-11-11 21:35:42 -08:00
Eric House
8099b77e52 refuse to a create second game from an invitation unless a debug pref 
is set.
 2013-11-11 20:44:08 -08:00
Eric House
7cf297ad0e fix so board still works after reloading, e.g. after turning screen 
off and back on.
 2013-11-11 08:09:15 -08:00
Eric House
a7b1e00cc2 remove trade menuitem when game over 2013-11-11 05:31:18 -08:00
Eric House
35721975db add menuitems for back/commit for trade mode parallel to the buttons 
at bottom (which should go when you have an action bar)
 2013-11-11 05:23:25 -08:00
Eric House
37aa4a9adf set tile border (highlighted and not) proportional to tile size for 
greater visibility on high-res devices
 2013-11-10 09:05:31 -08:00
Eric House
f27e798966 need to requestLayout(), not just invalidate(), after common code 
layout is finished.
 2013-11-10 08:37:28 -08:00
Eric House
7457ce9b80 fix so board draws correctly when loaded in trade mode 2013-11-10 06:55:01 -08:00
Eric House
82a82b5ae1 set trade mode in canvas where it'll do some good 2013-11-10 06:41:43 -08:00
Eric House
d598dde86e inval view even if board_draw says there's more drawing to do -- as 
there's probably still a lot that got drawn.
 2013-11-10 06:41:12 -08:00
Eric House
f6e0febd6d fix NPE 2013-11-09 08:20:32 -08:00
Eric House
397b03b074 save thumbnail along with summary to fix reset game keeping its old 
(and populated) thumbnail until opened
 2013-11-09 07:27:05 -08:00
Eric House
3142069adb save bitmap after generating it 2013-11-09 07:19:54 -08:00
Eric House
26a464aae4 set a minimum width for rem tiles display based on screen width rather 
than pixels
 2013-11-09 07:15:28 -08:00
Eric House
3e6a7418b1 move snapshoting code into GameUtils, and use it whenever loading a 
GameListItem that should have a snapshot but doesn't.  This lets games
have snapshots immediately rather than only after they've been opened
once.
 2013-11-09 06:59:33 -08:00
Eric House
e0dd481393 restore missing ivar init so remaining tiles square comes back 2013-11-09 06:48:09 -08:00
Eric House
049b8247ff clear all thumbnails whenever a thumb-related pref changes 2013-11-09 06:40:31 -08:00
Eric House
82f61b43f2 add utility to erase all thumbnails 2013-11-09 06:36:47 -08:00
Eric House
dfdbd9a8a2 pass scoreWidth separately into formatting code so space can be left 
for network status icon.
 2013-11-09 05:34:23 -08:00
Eric House
9f6baf39c4 don't insert rowid in any prefs list except the right one 2013-11-08 06:31:20 -08:00
Eric House
0a3a1623df DRAW message not needed (using invalidate instead) 2013-11-08 06:08:09 -08:00
Eric House
ea6ad877ca draw after changing/adding dict chars -- this may be the final step 
required to be able to render a board.
 2013-11-08 06:06:18 -08:00
Eric House
5a555b11b0 tweak appearance of snapshots preferences 2013-11-08 05:54:30 -08:00
Eric House
ecb225a6a8 try larger font size on high-res screens 2013-11-07 20:06:51 -08:00
Eric House
9e87a5ee92 implement getting active rect when that pref is set 2013-11-07 19:55:01 -08:00
Eric House
e780b536f9 obey thumb size preference. Currently "1/3" means 1/3 the size of the 
smaller screen dimension.  There may be a better scale.
 2013-11-07 19:28:00 -08:00
Eric House
41df94af31 new separate set of three prefs for thumbnails, and make the first, 
enable/disable, work.
 2013-11-07 19:07:19 -08:00
Eric House
fba7aee83a take thumb setting into account (though not in the rigth way yet, and 
changes are still reflected only after the list item's been forced to
reload)
 2013-11-07 07:51:57 -08:00
Eric House
a26dced506 drawing tray tiles can fail, e.g. when font info not yet available, so 
only clear bits when successful. Fixes problem where tray didn't get
drawn until tiles were somehow invalidated.
 2013-11-07 07:29:54 -08:00
Eric House
56f9f5f88e remove unused method 2013-11-07 05:48:39 -08:00
Eric House
16923eb27e save thumbnail in separate step, creating new square board-only 
drawctxt to render it without scaling.  Draw whole board rather than
just the active rect.
 2013-11-07 05:44:16 -08:00
Eric House
baba78535f fixes to the merge 2013-11-07 05:30:02 -08:00
Eric House
bb80cdfb08 Merge branch 'android_branch' into android_thumbnail 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardCanvas.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
 2013-11-07 05:25:51 -08:00
Eric House
272fc6e812 Move board_layout call onto jni thread, and change order in which it's 
done to make that work. This is a snapshot: not all boards draw completely,
and there's other debugging to be done.
 2013-11-06 06:49:27 -08:00
Eric House
499e07d84b follow convention: width usually comes before height 2013-11-05 06:38:48 -08:00
Eric House
d4cf98553c Merge branch 'android_branch' into android_thumbnail 2013-11-04 06:37:13 -08:00
Eric House
2d7392a16d pass new score- and tray-size params through 2013-11-04 06:36:52 -08:00
Eric House
9c9a04025a Merge branch 'android_branch' into android_thumbnail 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/XwJNI.java
 2013-11-04 06:20:53 -08:00
Eric House
e01af60dab build with COMMON_LAYOUT defined, and when off-by-default debug pref 
is on use it instead of java-side layout.
 2013-11-03 12:17:20 -08:00
Eric House
5dd209ef27 init summaries earlier 2013-10-31 20:33:23 -07:00
Eric House
9cd7dd6c98 fix to compile post-merge 2013-10-31 08:14:14 -07:00
Eric House
d7a1f53157 Merge branch 'android_branch' into android_thumbnail 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
 2013-10-31 08:13:39 -07:00
Eric House
45ad3499c5 (rough) move BoardView's Canvas into a new class so that, ideally, it 
can be used separately e.g. to draw thumbnails without opening a game
into a board.  Works well enough to render a full board, but not
otherwise tested.
 2013-10-31 08:08:41 -07:00
Eric House
bfa6132ade add board_setDraw() to jni 2013-10-31 08:07:07 -07:00