Commit graph

525 commits

Author SHA1 Message Date
Andy2
5ca9042b7e Merge branch 'android_branch' into french_xlation
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
2011-09-01 20:01:47 -07:00
Andy2
437e4e21ac There are buttons not menu items for exiting exchange mode so
reference them in newbie text.  And get rid of string for toast
exiting the mode since we don't show it.
2011-09-01 18:54:27 -07:00
Eric House
3de65206e8 Merge branch 'french_xlation' of ssh://xwords.git.sf.net/gitroot/xwords/xwords into french_xlation 2011-08-31 19:16:02 -07:00
Eric House
de6d4897a7 more progress, but still not done 2011-08-31 19:15:12 -07:00
Andy2
cdf526c95d Merge branch 'android_branch' into french_xlation
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
2011-08-31 06:46:02 -07:00
Andy2
671877cbca implement new util_ methods in jni and java; remove old miniwindow
stuff.  In java, respond to util_playerScoreHeld() and
util_bonusSquareHeld() by putting up toasts with existing strings.
For util_setInTrade(), fix exchange mode. Add two buttons at bottom
that replace toolbar (and corresponding buttons on menu). Redraw
scoreboard and board with high transparency to make it clear they're
disabled.  Still to do: deal with case where ability to switch which
player's tray is visible is enabled.
2011-08-31 06:37:33 -07:00
Andy2
03e4a41870 snapshot of continuing addition of contextual comments 2011-08-29 20:45:25 -07:00
Eric House
36305eed0e add more comments 2011-08-29 05:52:09 -07:00
Andy2
7f2becfe50 Merge branch 'android_branch' into french_xlation
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
2011-08-28 17:31:46 -07:00
Andy2
45421e8f86 add a bit of space between players column and column to right so
numbers don't run together.
2011-08-28 15:44:23 -07:00
Andy2
0a2255a8fe add two recent changes 2011-08-25 18:26:49 -07:00
Andy2
5acc2205be add pref to edit color used to draw bonus hints on cells 2011-08-25 18:13:42 -07:00
Andy2
3537161d3b add change 2011-08-22 18:40:30 -07:00
Andy2
7e6daa5797 move role out of players column to where it can be a full line long,
preventing it from increasing the size of the item by line-wrapping.
For now it's outside the View that gets hidden, but that may need to
change.
2011-08-22 07:05:33 -07:00
Andy2
d7a515ca97 display three states of relay connectedness in games list items:
configured, connected but waiting for players, and game-in-play.
2011-08-22 07:03:46 -07:00
Andy2
1ee0dfdd6d set wordlist spinner prompt and include language 2011-08-21 22:13:18 -07:00
Eric House
609f4be8a6 Merge branch 'android_branch' into french_xlation 2011-08-21 21:56:52 -07:00
Eric House
cf6d868bd3 use separate strings for window title and spinner prompt 2011-08-21 18:17:21 -07:00
eehouse@eehouse.org
abe270d45c Merge branch 'android_branch' into french_xlation 2011-08-21 15:03:57 -07:00
Andy2
aeafb9cefa Tweak language for moving wordlists to more clearly refer to storage
locations.
2011-08-21 15:03:41 -07:00
Andy2
6b8fd222ef Merge branch 'android_branch' into french_xlation
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
2011-08-21 14:35:53 -07:00
Andy2
d1b6bc16cf add the standalone/network icons from GamesList display to the new
games dialog so users get some association going.
2011-08-21 14:30:00 -07:00
Andy2
04834c910b more dictionary->wordlist terminology change: debug-only preference
and download URL.
2011-08-21 14:27:50 -07:00
Andy2
a17ff20db7 clean up background check pref wording to Chris's suggestions 2011-08-21 13:52:51 -07:00
Andy2
a72883ae9a Merge branch 'android_branch' into french_xlation
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
2011-08-21 12:29:32 -07:00
Andy2
5c8afa06ce version string and changelog for beta 33 2011-08-21 12:07:45 -07:00
Andy2
c38e3593fb replace hard-coded placeholder names for optional top-line of games
list item display with real "aa vs. bb vs..." consed up in
GameSummary, and set field to singleline so doesn't wrap when names
get too long.
2011-08-21 11:39:38 -07:00
Andy2
28c78a0a6a dictionary->wordlist 2011-08-20 14:16:38 -07:00
Andy2
fd4e627628 when sd card is umounted, android sends a message to apps. I can't
figure out how to get that so I ignore it and am killed then
relaunched if I have a dict file open on the SD.  On relauch, don't
crash.  Instead, check if any dicts used by the game is unreachable
and put up an alert with only one choice: Close game.  Thought about
using the missing-dicts stuff from GamesList, but this is a special
case that should be seen only when user umounts while a BoardActivity
instance is frontmost.
2011-08-18 07:54:00 -07:00
Andy2
455cb9a4c4 Include possibility of umounted sd card in missing dict
explanation. Name of game too.  Use single-selectable list and
Substitute button instead of expecting user to tap once to select
(which confused me.)
2011-08-18 06:26:43 -07:00
Eric House
5c68f375fd reorder more strings and add a bunch more context comments. 2011-08-16 19:42:54 -07:00
Eric House
9f84468297 beginning process of adding contextual comments to all translatable strings. 2011-08-15 21:49:30 -07:00
Andy2
e2ef25ae90 add pref for choosing what goes in parens along with the game name
(where <language> was before.)  opponent name still needs to not be
hard-coded; the rest works.
2011-08-09 19:26:59 -07:00
Andy2
ceb2d1ac63 fix indenting -- white space only. 2011-08-09 06:48:10 -07:00
Andy2
ab64d57f5c adapt a couple of icons as placeholders for standalone and networked
games.  Every games-list item now has an icon.  The networked game
icon is replaced by the sync icon when there's new information.
2011-08-08 18:56:19 -07:00
Andy2
d08eacc4c0 comment: reminder of possible icon for archiving 2011-08-08 18:53:58 -07:00
Andy2
f8715feea6 update version and changelog for b32 2011-08-06 23:08:42 -07:00
Andy2
011b283566 tweak copy dialog to suggest using new-from. 2011-08-06 16:18:32 -07:00
Andy2
719fd314a5 move net msg icon outside of hideable part of game list item layout so
it remains visible when not expanded.  Otherwise people won't see that
something happened to a closed game.
2011-08-06 16:03:38 -07:00
Andy2
6cde6be6a5 up version and changelog for beta 31 2011-08-06 14:29:58 -07:00
Andy2
35a5aad477 make name text larger -- button is anyway. 2011-08-06 13:19:48 -07:00
Andy2
d7dfb89f65 query user before sending invite whether to use html or text and
format differently depending on the answer.  With html only I couldn't
invite using SMS, which bites.
2011-08-06 13:01:40 -07:00
Andy2
560208f516 roll my own expandable list items. (The stupid built-in ones don't
allow any control over whether the initial state is expanded.)
Getting click to work is a bit of a hack, requiring a callback from
the adapter back to the activity, but it works well on emulator.  Need
to test on device then try to shrink the ImageButton.
2011-08-06 11:29:41 -07:00
Andy2
58f1618586 put oft-used menuitems up higher 2011-08-06 03:19:59 -07:00
Andy2
9c298a16e7 The email apps won't display non-http schemes as clickable links, so
go with html and encode both the invite and install links as php refs
that get redirected.  Works, but eliminates SMS as sending mechanism.
2011-08-06 02:57:14 -07:00
Andy2
e8b66e230c add title to context menu that includes game name 2011-08-04 18:16:32 -07:00
Andy2
9aeb8858fe add menuitem and dialog it triggers to rename games. Add new DB field
to hold game name, and getter and setter.  Replace existing gameName()
method with call to new getter.
2011-08-03 18:59:32 -07:00
Andy2
3563ca5855 finish changes list 2011-07-22 10:54:06 -07:00
Andy2
1f89eb0238 start on changes list 2011-07-19 18:37:23 -07:00
Andy2
ea853e2e51 replace hard-coded list of preferences whose summaries are their
values and code to enforce that with custom subclasses that do the
right thing automatically.
2011-07-19 18:21:52 -07:00