Commit graph

613 commits

Author SHA1 Message Date
Andy2
17edc79aaf Merge branch 'android_branch' into send_in_background
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2011-12-06 19:56:10 -08:00
Andy2
5d01de4c0c found a better send email menu icon 2011-12-06 19:24:22 -08:00
Andy2
5d09c7bbed add git describe for version to email body 2011-12-06 19:19:50 -08:00
Andy2
7884246d7a add menu to main screen for sending me email. TODO: find a darker
menu icon; add git revision to outgoing text.
2011-12-06 18:49:48 -08:00
Andy2
3b48c3ca60 use title rather than a field in custom view for title of lookup
dialog.
2011-12-06 18:25:55 -08:00
Andy2
ebca62b25e don't specify text file for view used in Dialog -- device will set it.
Prevents invisible text on HTC MyTouch.
2011-12-06 18:21:33 -08:00
Andy2
0474984b82 export new preference from jni and add a checkbox setting for it 2011-12-06 18:18:50 -08:00
eehouse@eehouse.org
e1e8516e1b Merge branch 'android_branch' into send_in_background 2011-12-02 19:04:12 -08:00
Andy2
ae2e27e651 Put the values button back (and remove the corresponding menuitem). 2011-12-02 18:14:26 -08:00
Eric House
c1e420f726 Merge branch 'android_branch' into send_in_background
Conflicts:
	xwords4/relay/rq.c
2011-11-29 06:45:32 -08:00
Andy2
1575279cd8 replace restore menus in prefs activity with buttons at bottom of
screen.  The trick involves getting the OS to insert the prefs xml
layout as a ListView, and seems like a hack, but it works so far.
Ought to be tested on several OS versions before next release.
2011-11-22 19:00:03 -08:00
Andy2
d37424ad7f Merge branch 'android_branch' into send_in_background
Conflicts:
	xwords4/linux/linuxutl.h
2011-11-21 22:18:52 -08:00
Andy2
795b86e569 when asked to browse empty dict, put up explanatory dialog then exit
activity.  Required new DlgDelegate method to send event after posting
alert.  Note that eventually when the dict browser shows tile info as
well as words this will change.
2011-11-21 18:08:51 -08:00
Andy2
c7906c3bd4 prevent min from exceed max by not including values below min as
possible max settings and vice-versa.  Since spinner values no longer
have a consistent base, parse them rather than relying on position --
requires assumptions such as that View is a TextView, but that is
probably not changing.
2011-11-21 08:19:25 -08:00
Andy2
c781bfc29e remove hard-coded 2-15 array for word-len limit spinners and instead
create at runtime arrays that represent the words actually in the dict
-- e.g. showing a max of 8 when there are no words longer than that.
2011-11-18 21:24:59 -08:00
Andy2
2492e7cfc5 Merge branch 'android_branch' into send_in_background
Conflicts:
	xwords4/linux/cursesmain.c
2011-11-13 17:10:46 -08:00
Andy2
dddec50f1d Merge branch 'android_branch' into android_browsedict
Conflicts:
	xwords4/android/XWords4/jni/Android.mk
	xwords4/linux/Makefile
	xwords4/linux/linuxmain.c
2011-11-10 19:22:57 -08:00
Andy2
e4aa2ff180 finish changelog 2011-11-07 06:51:27 -08:00
eehouse@eehouse.org
214f8990bf Merge branch 'android_branch' into android_browsedict 2011-11-04 17:23:27 -07:00
Andy2
0561ca5ab9 make buttons a bit wider since the bar scrolls now, and rearrange. 2011-11-04 17:14:37 -07:00
Andy2
fa14f02b69 add ui support for min,max filtering of wordlist. Not yet wired into
jni.  But: even disabled it seems to lead to much slower scrolling, so
I need to investigate that before taking this any further.
2011-11-04 06:18:11 -07:00
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
8704acfbf1 launch dict browser from tap on dict rather than contextual menu on it. 2011-11-02 05:06:53 -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
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
Eric House
1741021c3c add search field and button. Not yet wired to do anything. 2011-10-27 18:26:48 -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
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
eehouse@eehouse.org
b8adbd94c1 Merge branch 'android_branch' into send_in_background 2011-10-18 06:47:38 -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
eehouse@eehouse.org
5afb0ae145 Merge branch 'android_branch' into send_in_background 2011-10-14 22:34:29 -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
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
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
Eric House
861a24dfeb Merge branch 'android_branch' into send_in_background 2011-10-10 22:42:28 -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
eehouse@eehouse.org
99707e4029 Merge branch 'android_branch' into send_in_background 2011-10-10 18:31:30 -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