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

1656 commits

Author SHA1 Message Date
Eric House
30387bc528 up version codes 2011-11-03 21:27:43 -07:00
Andy2
948def8223 replace burried launch-dict-browser menuitem with toolbar button and 
newbie hint.
 2011-11-03 18:14:01 -07:00
Andy2
8db6b0bddd wrap toolbar in a HorizontalScrollView. Comes into action when all 
buttons are enabled.
 2011-11-03 17:24:56 -07:00
Andy2
d19858d6bb add (buried) menuitem to launch dict browser from game. Required 
adding method to get current player from BoardView.
 2011-11-03 05:51:38 -07:00
Andy2
6e58963231 sign up to handle keyboard/orientation changes for dict browser 2011-11-03 05:32:36 -07:00
Andy2
eace89000b save text size rather than figure each time 2011-11-03 05:20:38 -07:00
Andy2
a5498ee33a fix find to return position rather than boolean 2011-11-03 05:20:11 -07:00
Andy2
56fc73e78a don't go straight from tap on dict word to browser: add bool so that 
even if there's only one lookup URL it'll be listed and user can
quickly cancel.
 2011-11-02 18:48:13 -07:00
Andy2
c222f08252 catch up with API changes. 2011-11-02 18:46:06 -07:00
Andy2
7231bd4be3 make dict entries text size bigger 2011-11-02 05:18:10 -07:00
Andy2
8704acfbf1 launch dict browser from tap on dict rather than contextual menu on it. 2011-11-02 05:06:53 -07:00
Andy2
050a68ce42 use XP_REALLOC now that it's fixes 2011-11-02 05:04:31 -07:00
Andy2
b822f573d6 use getStartsWith() to implement search; add dict name and word count to 
title; change text of menu item that launches dict browser from
Details to Browse
 2011-11-01 18:45:41 -07:00
Andy2
9f2158f094 add dict_getStartsWith to jni 2011-11-01 18:43:36 -07:00
Andy2
482aca5cfb fix crash due to bad allocation of indexing data space. First cut 
used XP_REALLOC, but that turns out to be broken, at least on android.
Haven't really used it before...
 2011-11-01 18:33:29 -07:00
Andy2
11b7ed1e8e fix to compile with new dictiter files 2011-10-31 21:11:22 -07:00
Andy2
3c53da46ce fix to compile with changed API. Crashes, but want to fix up API in 
other branch before debugging here....
 2011-10-31 18:22:33 -07:00
Andy2
7d1e9c7638 Merge branch 'android_branch' into android_browsedict 
Conflicts:
	xwords4/android/XWords4/jni/Android.mk
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
 2011-10-28 22:27:22 -07:00
Andy2
8f3c4f6426 add config option to enable face-up tile picking 2011-10-28 22:24:47 -07:00
Andy2
8d228ae190 turn on face-up tile picking for Android (though there's no prefs UI 
to enable it for a game yet).  In common code, break pick tile utils
method in two, one for blank and the other for tray tiles.  In java,
implement dialog for picking the tiles.  Works, though is a bit clumsy
to have the dialog come and go after every pick.  Better would be a
dialog that stays up and accumulates picks -- but it'd have to know to
reduce the set of tile choices as letters are chosen.  This'll do for
now.
 2011-10-28 22:15:56 -07:00
Andy2
4df13f5617 fix missing dict language 2011-10-28 06:39:47 -07:00
Andy2
b490618c8e silence warning with cast 2011-10-28 06:34:59 -07:00
Eric House
84044fa9ee move lookup dialog into superclass so can be used from dict browser. 2011-10-27 21:10:35 -07:00
Eric House
308720186d get all word-click events and print contents -- setting up for lookup 2011-10-27 18:43:28 -07:00
Eric House
1741021c3c add search field and button. Not yet wired to do anything. 2011-10-27 18:26:48 -07:00
Eric House
ed055b83c6 export index from jni and use for fastscrolling. Works, but is a bit slow still. 2011-10-27 07:01:57 -07:00
Andy2
92f692510f outline for fastscroll with thumb. Will need jin support mapping 
indices <-> first letters, e.g. BB to whatever the index is of the
first word starting with BB.
 2011-10-25 19:33:55 -07:00
Andy2
a7ce5a43de fix so count comes from dict; combine two jni methods into one; fix 
crash in destructor.  Now an entire dict can be scrolled through if
you have the patience.
 2011-10-25 18:36:12 -07:00
Andy2
74cf751729 use existing dict iteration APIs to implement jni that adequately 
displays a dict.  But I don't have a getNth in C to implement the one
I've added in java; need to add that, and caching, to speed it up.
 2011-10-24 20:15:52 -07:00
Andy2
b08f9770cf add dictionary browser. For now it just adds items to the list that 
give the position so I can get a feel for how it works.  Will use this
to figure out the right API for a dictionary iterator.
 2011-10-23 19:35:15 -07:00
Andy2
c237717de5 dict_getInfo returns false if the dict doesn't parse so can be used to 
test validity of downloaded dict.  Internally (in jni), add lots of
checks that format is correct and we don't run off end of ptr walking
truncated dict.
 2011-10-23 14:21:57 -07:00
Andy2
201c32e4db add support for download directory as a place where we look for dicts 
and to/from which dicts can be moved.  Right now it's just
/sdcard/download.  Dunno if that's universal.  There seems not to be
API except in newer SDK versions for finding it.
 2011-10-20 20:22:36 -07:00
Andy2
4eee7f8aa7 Pass selected tiles into new util function, and from there into java 
world, so confirming query can include them.
 2011-10-19 18:34:26 -07:00
Andy2
d63f6961d4 fix log comment to correctly identify site. 2011-10-18 21:29:59 -07:00
Andy2
90b0a4e46f if words stream is null, don't pass into java code (where current impl 
will get a NPE)
 2011-10-18 21:28:50 -07:00
Andy2
028c416587 don't disable player listing when game is in play and locked; allow 
users to see info about players and change dict.
 2011-10-18 06:46:46 -07:00
Andy2
71fabdac95 add changelist change 2011-10-18 06:35:26 -07:00
Andy2
214debca47 up strings for beta 37 2011-10-18 06:16:15 -07:00
Andy2
ff82c20b2c fix brokenness (black-on-black text in lookup dialog) on 2.2 and 
beyond by copying in layout for built-in list items and hard-coding
white text color.  This is risky/fragile but I can't find another fix.
 2011-10-17 21:33:11 -07:00
Andy2
dc84cfcb97 cleanup/reformat. No code change. 2011-10-17 20:27:51 -07:00
Andy2
29eec38821 remove unused strings 2011-10-16 17:59:00 -07:00
Andy2
6793742f0f remove option to list all words played in a single lookup dialog, and 
supporting code in the jni/common C.
 2011-10-14 22:32:30 -07:00
Eric House
46392da205 Fix crash when password dialog comes up second time: don't be cute and 
reuse custom views as they remember their parent and that needs to be
cleared.  Just recreate each time and let gc() do its job.
 2011-10-14 19:07:19 -07:00
Eric House
851b2d296f Should have gone with last checkin: delete of file due to renaming. 2011-10-14 19:05:07 -07:00
Eric House
e848b150b5 rename LookupActivity->LookupView since it's not an Activity any more. 2011-10-14 18:45:47 -07:00
Eric House
0b54b190b6 make lookup dialog a mere dialog rather than an activity to fix 
too-slow transitions to and from it.  Works by keeping code in
separate custom view and not setting buttons or anything else on the
dialog.
 2011-10-14 18:39:39 -07:00
Andy2
0e6b4d749f When pen held on committed tile on board, cons up list of all words 
played that include that tile and pass to new util_cellSquareHeld()
method.  In java implementation of that method, use existing lookup
activity code to display list of words.  Enabled on the C side by a
compile-time flag in case it has problems.  Right now the time spent
saving a game before launching the lookup activity, and reloading it
after, is pretty apparent, but that's in emulator which is slow.
 2011-10-13 19:14:08 -07:00
Andy2
01459285d5 show dict as comment beside player name in players list. And since 
dicts change when language does, put language choice above players
list.
 2011-10-12 18:37:31 -07:00
Andy2
9551f29335 up strings for beta 36. I'm skipping b35 rather than try to move the tag. 2011-10-10 22:30:38 -07:00
Andy2
92a2fb1a1f attach newbie info to the lookup button 2011-10-10 18:24:06 -07:00
Andy2
cdf57d3bb7 cleanup 2011-10-10 06:53:46 -07:00
Andy2
c3ba50c905 up strings for beta 35 2011-10-07 18:59:32 -07:00
Andy2
03543c17ea fix NPE I got once, presumably when activity shutting down. 2011-10-07 18:59:17 -07:00
Andy2
f03699f701 add newbie warning/request for languages with only google as 
word-lookup site.
 2011-10-06 19:03:07 -07:00
Andy2
f084661ec3 Never meant to check in having lookup menuitem at top level. 2011-10-06 18:47:08 -07:00
Andy2
152a9175c6 use dialog theme for lookups -- just works now, though didn't at first. 2011-10-06 18:44:59 -07:00
Andy2
a129f353f5 fix assertion by skipping states only when applicable, and running in 
a loop so works in either direction.  Cleanup -- this is done.
 2011-10-06 18:44:24 -07:00
Andy2
0a474804ce fix to work with bundling, i.e. by removing configChanges entry in 
AndroidManifest.xml and changing orientation.
 2011-10-06 18:25:17 -07:00
Andy2
d8c1e3822b fix problems with skipping singleton words and URLs; replace window 
title with TextView.
 2011-10-06 17:47:00 -07:00
Andy2
a9b467c903 make adapter based on static array static 2011-10-06 06:31:04 -07:00
Andy2
e292056b9c add new activity (with layout) to replace dialogs for word lookup. 
Lots of code moved there from BoardActivity.
 2011-10-06 06:26:46 -07:00
Andy2
aaf0ba34e4 add a couple of French word lookup URLs. 2011-10-05 06:55:25 -07:00
Andy2
90f11abc37 add to game state passed into java world whether it's the cur selected 
player's turn, and use that to enable/disable Pass/Turn done button.
 2011-10-05 06:36:01 -07:00
Andy2
179560867f for symmetry, remove default menu title from res file and set in code 
either way.
 2011-10-05 06:14:48 -07:00
Andy2
c5c0fbccae remove unused DrawFocusState params from jni interface 2011-10-04 19:03:27 -07:00
Andy2
dc20b04a4c remove unused param (on the C/jni side) 2011-10-04 18:54:53 -07:00
Andy2
3ec97d5c07 Turn "Turn done" into "Pass" when the pending score is 0. To do that 
I had to pass the score into draw_trayBegin since
draw_drawPendingScore() isn't called until the first tile's placed.
Note: as long as I'm messinng with this menuitem it should be disabled
when it's not the player's turn.
 2011-10-04 18:48:33 -07:00
Andy2
f4b8b2806e remove unused parameter 2011-10-04 06:48:53 -07:00
Andy2
5dd21a16ea don't crash if words stream is null, as it will be when turn's a pass. 2011-10-04 06:45:16 -07:00
Andy2
5773466fb6 prevent lookup dialogs from coming up before button pressed by not 
assigning m_words too early.
 2011-10-04 06:19:06 -07:00
eehouse@eehouse.org
fe1bfead87 Merge branch 'two_phase_lookup' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 2011-10-03 06:46:24 -07:00
Andy2
072516655e Use words list passed into informMove rather than query when user 
presses button.  Include word in button text when there's only one.
 2011-10-03 06:43:20 -07:00
Andy2
35e4c21f17 add util_informMove to jni. Use it, but not to advantage yet. 2011-10-02 16:42:10 -07:00
Eric House
8a5667f011 add missing language codes 2011-09-22 17:16:27 -07:00
Andy2
b7691d2997 Merge branch 'android_branch' into two_phase_lookup 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
 2011-09-22 06:53:45 -07:00
Andy2
fcdbed0920 fix to work with changed C api 2011-09-22 06:49:34 -07:00
Andy2
b10453bd25 cleanup 2011-09-22 06:14:22 -07:00
Andy2
e887d0a116 make word lookup two-stage, first a dialog to pick the word then 
another to pick the URL.  Hacky code takes us back to the first after
the second is dismissed while only showing either if there's a choice
to be made.  Also add menu item to lookup all words in the game --
useful for testing when robot refuses to play multiple words but maybe
also worth shipping.
 2011-09-21 19:04:33 -07:00
Andy2
c44a884184 try another item layout -- need to fix the background instead. 2011-09-21 05:47:12 -07:00
Andy2
617de4eb7e make lookup dialog two-part, with list of lang-supporting URLs at top 
and words at bottom.  You choose a URL/site, then tap a word, and
repeat until you're done.
 2011-09-20 19:01:37 -07:00
Andy2
97334faa95 switch to lookup url that can include language, and include it when 
French or German in use.  Disable button if I don't know how to look a
word up.  Later will want to have multiple URLs available, falling
back to googling for the word if I don't know about an online
dictionary.
 2011-09-19 07:53:29 -07:00
Andy2
d7a04f87e6 add custom view for wordlist dialog so it doesn't get dismissed the 
first time you pick a word -- now all can be looked up if desired.
 2011-09-19 06:45:15 -07:00
Andy2
ea3e015a8f use server_listWordsPlayed to implement lookup button: get list from 
jni, and when it calls back with it launch the browser directly if
there's only one, otherwise put up a choice list.  Currently the list
dismisses after launching the browser once: need to fix that, probably
with a custom View.  And need to deal with non-English games, and
maybe add other choices for lookup than dictionary.com.
 2011-09-18 19:10:12 -07:00
Andy2
dced47e202 export server_listWordsPlayed via jni. 2011-09-18 19:06:23 -07:00
Andy2
b579bb0bca first step in implementing lookup of words: add button and browser 
launch to single website for hard-coded word.
 2011-09-16 06:44:25 -07:00
Andy2
131bb561bc cache reference to prefs 2011-09-15 18:59:39 -07:00
Andy2
6bd72a54bf rename php scripts so their URLs are a bit more helpful when the user 
has to see them, as happens when invitation is send via SMS.
 2011-09-15 18:52:15 -07:00
Eric House
35b2ae0f42 remove dead strings. Move app-name to common_rsrc.xml since it's not 
translated.
 2011-09-15 18:08:00 -07:00
Eric House
df82578d5a add a ton of comments -- I think I'm done. No changes to any string here. 2011-09-15 18:07:07 -07:00
Eric House
a676b5beb0 comment out dead code referencing strings 2011-09-15 18:06:12 -07:00
Eric House
ced5da45a5 remove unused string ref 2011-09-15 18:05:45 -07:00
Andy2
8cb49ad8a3 Merge branch 'android_branch' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into android_branch 
Conflicts:
	xwords4/android/scripts/strings_check.sh
 2011-09-14 06:51:10 -07:00
Andy2
25f7c72994 add some comments and rearrange 2011-09-14 06:46:52 -07:00
Andy2
d69bbfed97 copy over from french_xlation branch 2011-09-14 06:39:23 -07:00
Andy2
c3f9fc6f7b remove unused strings 2011-09-14 06:13:32 -07:00
Andy2
2ee4ec12d5 toward merge with french_xlation: remove unused and move debugging 
strings.
 2011-09-14 05:50:55 -07:00
Andy2
45bf34fdc1 just copy it over from french_xlation branch -- screw history 2011-09-13 19:01:16 -07:00
Andy2
b6cfdbbb37 print strings as single lines for easy comparison 
Conflicts:

	xwords4/android/scripts/strings_check.sh
 2011-09-13 18:59:14 -07:00
Andy2
7edf615b40 add comment noting that this release breaks old games configure not to 
use English.  (Specifically, they've been played in English until now
and played letters will be reinterpreted in the right language for the
first time.)
 2011-09-13 18:33:30 -07:00
Eric House
0bd9500033 add options to be used comparing across branches 2011-09-12 22:09:11 -07:00