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

1380 commits

Author SHA1 Message Date
Eric House
427b652c27 add pref and strings for the key that'll be used to prevent multiple 
attempts to download wordlist for non-English phone
 2015-03-27 22:00:24 -07:00
Eric House
3995d96a9f this is now a generated file 2015-03-27 07:28:52 -07:00
Eric House
ac811f1690 move French strings into res_src/, and add script to filter/copy all 
strings.xml files from there to res/, effectively including them in
the app the way the Android SDK intends. This will allow me to turn
off the downloadable localization stuff which is tripping over having
more than English built in. ToDo: incorporate the copy into the build.
 2015-03-27 07:26:51 -07:00
Eric House
b684e32dca remove duplicate lookup URLs 2015-03-25 05:45:47 -07:00
Eric House
1cd450bb7b use <plurals> for dictionary deletion string 2015-03-25 04:52:02 -07:00
Eric House
7c45ec5f8c add Wiktionary as a lookup option. This overlaps Catalan, so duplicate 
links need to be detected and suppressed.
 2015-03-25 04:50:35 -07:00
Eric House
6f556f7264 latest French strings 2015-03-24 07:41:53 -07:00
Eric House
930d72402d fix crash due to mis-numbered format specifier 2015-03-23 07:50:29 -07:00
Eric House
2631ab1094 add prefs checkbox to disable it's-your-turn notifications 2015-03-23 07:30:42 -07:00
Eric House
bd7bfb328e use localized language names; add some quantity="one" plurals items 
for English; revert one <plural> to <string> because the quantity is
fixed and knowable and a pain to pass to getQuantityString().
 2015-03-20 07:28:40 -07:00
Eric House
328300c8a2 add translations of language names 2015-03-19 22:34:08 -07:00
Eric House
1dcc40df02 latest French strings 2015-03-19 22:25:44 -07:00
Eric House
202bcef034 undo utf8->ascii changes made by old version of script; add language 
names so they can be localized (though the strings aren't used yet)
 2015-03-19 22:20:06 -07:00
Eric House
5f33d99c2e toward making full use of getQuantityString(): add util method to pass 
quantity through to java world, use it, convert English <string>
resources to <plurals> (using python script) based on parallel changes
in French, and modify callsites to call getQuantityString() where
R.string.xxx became R.plurals.xxx.
 2015-03-18 21:23:30 -07:00
Eric House
fff57a5638 use plurals for another string, and add getQuantityString to delegates 
baseclass.
 2015-03-17 21:22:37 -07:00
Eric House
caf4d73e46 Use plurals for first time as test case. More to follow, along with 
accomodating fixes to the LocUtils system.
 2015-03-17 07:20:56 -07:00
Eric House
a055815b70 fix so prefs doesn't crash when pct_suffix is translated 2015-03-16 07:10:41 -07:00
Eric House
84a291216e move a few more debug strings out where they can be translated; fix 
(via hack!) so translator credit is shown.
 2015-03-15 21:46:03 -07:00
Eric House
632332363e latest French translations 2015-03-15 21:09:57 -07:00
Eric House
4718056344 more French strings 2015-03-12 21:14:55 -07:00
Eric House
1debad42bc make paired buttons height fill their container, forcing them to be 
the same size in the case where one has two lines of text and the other
doesn't. Should make no difference in English, but matters for French.
 2015-03-12 21:06:31 -07:00
Eric House
60c320d1ae fix buttons being unaligned when one has longer text (e.g. in French) 2015-03-12 07:17:33 -07:00
Eric House
e871819a9d move strings used for debug features, e.g. debug menu, into 
strings.xml so they can be translated.
 2015-03-10 20:24:54 -07:00
Eric House
b01b43d5d8 tweak string 2015-03-10 08:06:44 -07:00
Eric House
1851485d66 add missing strings (using script) 2015-03-10 07:40:50 -07:00
Eric House
6466f1aff9 more French translations 2015-03-10 07:13:54 -07:00
Eric House
3282c1fbdb tweak invite alert strings 2015-03-09 07:39:21 -07:00
Eric House
353014e1ee tweak strings and dialog titles around inviting 2015-03-07 18:18:27 -08:00
Eric House
4d4e0ed2f8 add french strings.xml file with first 52 translated strings. (It also 
contains a lot of English which is causing comments to duplicte in
R.java. Harmless, but will be fixed.)
 2015-03-07 11:07:53 -08:00
Eric House
bcaacc9d19 show newbie offer to re-enable public rooms but only for those who are 
upgrading rather than installing for the first time. (This should be
reverted once a version ships with it since it'll otherwise show on
every upgrade.)
 2015-03-07 10:18:47 -08:00
Eric House
8ac48528be hide public rooms stuff unless a new preference is set. And mark that 
preference "advanced." TODO: add an alert for users for whom this
isn't a new install that it's moved.
 2015-03-07 08:15:09 -08:00
Eric House
2f13cadbb9 set default new game name to include count of all games created (count 
of game names created, actually)
 2015-03-07 07:20:13 -08:00
Eric House
fa6c043433 Merge remote-tracking branch 'sf/android_branch' into android_multi2 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2015-03-04 07:32:43 -08:00
Eric House
b967c39c20 up strings for release 2015-03-04 06:56:12 -08:00
Eric House
736e5f1ea0 prevent keyboard from coming up on launch of game config activity; 
instead wait until room name is tapped. (I did this in two places
though one might have been enough. On some devices anyway that
AndroidManifest change is needed to close a keyboard if it's open
prior to opening the activity.)
 2015-03-04 06:17:18 -08:00
Eric House
2371111edf add warning to rename game alert that the name won't sync, but only 
for networked games in progress.
 2015-03-03 07:55:43 -08:00
Eric House
863d83bf44 reorder prefs 2015-03-02 07:11:34 -08:00
Eric House
6964458c84 fix string 2015-03-02 06:20:17 -08:00
Eric House
ed212801c8 first pass at enabling Rematch, which seems to work for SMS and 
Bluetooth. Relay will take a bit more work, and there are rough edges
still.
 2015-02-26 06:01:17 -08:00
Eric House
da3452f3fa Merge remote-tracking branch 'sf/android_branch' into android_multi2 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2015-02-24 06:46:16 -08:00
Eric House
7229d110a0 go ahead an up the beta version number too 2015-02-23 21:51:25 -08:00
Eric House
86d8a46da2 Merge branch 'android_branch' into android_multi2 
Conflicts:
	xwords4/common/comms.c
 2015-02-18 19:40:36 -08:00
Eric House
b89395ffb9 up strings for new release 2015-02-18 19:24:17 -08:00
Eric House
3dd16b5883 alert on receiving phone when SMS sender is using older/incompatible protocol. 2015-02-18 06:49:43 -08:00
Eric House
7e8c30f2ab add preference controlling whether radio-free short-circuiting is used 
for SMS sends when sending and receiving number are the
same. Short-circuiting is faster and tests 99% of the code without
triggering Android's annoying OS-level too-many-sms-sends alerts, but
sometimes you need to test the radio too.
 2015-02-17 20:16:44 -08:00
Eric House
385220cf92 add debug preference, unused so far, for faking the type of radio I 
have. Goal's to debug non-GSM devices correctly hiding all references
to play-via-SMS.
 2015-02-13 18:52:13 -08:00
Eric House
98fe7eb343 if BT's off, offer to turn it on programatically rather than telling 
user to do it himself
 2015-02-13 18:38:24 -08:00
Eric House
49024ae070 offer to turn SMS on when setting the global pref too 2015-02-13 18:16:30 -08:00
Eric House
9399ddd0ab add a bit of space to the custom view 2015-02-12 21:12:28 -08:00
Eric House
6cfedf7fb5 fix button being missing at the wrong time 2015-02-12 19:24:32 -08:00
Eric House
1a94bab9e8 add naming of game to game creation, including adding custom view to alert 2015-02-12 07:41:28 -08:00
Eric House
2142c752bf factor confirm-unlimited-SMS stuff out into utility dialog so I can 
turn on SMS from outside preferences -- which is a much better
experience than sending somebody into the prefs labyrinth
 2015-02-11 07:51:19 -08:00
Eric House
4ddf11387f make send-nfc-to-self available through a debug-only preference rather 
than only on DEBUG builds.
 2015-02-05 06:56:04 -08:00
Eric House
c2a87c187d as a DEBUG-only feature, enable "send" of NFC to self to better 
duplicate on a single device how real devices are meant to be
inviting.
 2015-02-04 22:15:20 -08:00
Eric House
2c7469f228 emphasize button by centering it rather than making it green, since 
color replacing a drawable looks like crap and the ways of doing it
right are too complicated and may not look good on all devices/OS
versions.
 2015-02-04 07:21:17 -08:00
Eric House
e0a337ff4c deal with case where user removes existing game's ability to connect: 
refuse to save until something's put back
 2015-02-03 22:11:13 -08:00
Eric House
8abe7720c8 don't allow saving/playing a multi-divice game that doesn't have at 
least one way of connecting. Instead, give a choice between discarding
it and editing, and if the latter choice it taken open the alert for
picking ways to connect. Requires a new version of showConfirmThen()
that lets the negative button be other than "Cancel".
 2015-02-01 22:15:06 -08:00
Eric House
46c4cc0669 warn when user disables all communication options in prefs 2015-01-31 23:17:13 -08:00
Eric House
0972e07b4e give download button a green background for greater visibility 2015-01-27 21:42:42 -08:00
Eric House
a4842bdaab just hide the "hide title" pref on devices where it's a no-op -- 
rather than explain to a user why his action is being ignored
 2015-01-27 21:40:22 -08:00
Eric House
1b6f0de8e6 inset checkbox for better visibility 2015-01-27 08:24:06 -08:00
Eric House
fb13c949e8 re-enable ActionPairs stuff now that an additional button works/fits. 2015-01-27 08:14:06 -08:00
Eric House
5cece9f3cc Merge remote-tracking branch 'sf/android_branch' into android_multi2 
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
 2015-01-27 07:53:42 -08:00
Eric House
828b620c44 make "do not show again" a checkbox instead of a button -- requires a 
trivial custom view.
 2015-01-27 07:46:18 -08:00
Eric House
41a2655248 move newbie hint about hiding newgame buttons to the buttons 
themselves, and disable third button because it isn't shown on the
devices I'm testing on. Not sure why. Tweak text to make sense in that
context.
 2015-01-27 07:11:49 -08:00
Eric House
5f5e35e885 hide (the right way) play-via-sms preference on non-gsm phones 2015-01-26 07:06:43 -08:00
Eric House
74ce8116ea don't allow to enable SMS or BT if the feature's off on the phone, and 
warn via an alert (varies by whether in prefs or game config) in that case.
 2015-01-25 17:40:23 -08:00
Eric House
2c5cf9da39 move conn-via set manipulation into a custom view prefs and game 
config can both use.
 2015-01-25 16:14:34 -08:00
Eric House
b851427fd9 tweak string 2015-01-25 15:17:28 -08:00
Eric House
f983e477a2 remove all code for sending and receiving non-data SMS. The plan is 
that SMS will only be supported for GSM phones from here out (unless
Google figure out how to make the Data SMS APIs work on CDMA devices.)
 2015-01-25 13:56:33 -08:00
Eric House
9806b01d6b get rid of send-invitation menuitem, since it's never there unless 
there's a dialog in front of the board forcing you to send an
invitation.
 2015-01-24 16:32:11 -08:00
Eric House
56e61061be add alert explaining "just tap" when user picks nfc for sending invite 2015-01-24 14:29:49 -08:00
Eric House
dd6aa95068 force invite alert to stay up as long as a host has players missing. 2015-01-24 14:18:30 -08:00
Eric House
17f4e35bf4 tweak wording 2015-01-24 12:57:42 -08:00
Eric House
b2781afeb3 offer to hide newgame buttons via augmented showNotAgainDlgThen shown 
when player has five or more games in list.
 2015-01-24 12:47:22 -08:00
Eric House
027cd319e6 Merge branch 'android_branch' into android_multi2 
Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-01-24 10:10:10 -08:00
Eric House
44624b20d9 up strings and changes list for release 2015-01-24 08:59:44 -08:00
Eric House
9b0eba8be6 up copyright for the new year 2015-01-24 08:54:06 -08:00
Eric House
f48d79d4c8 provide default default language name (and rename string constant 
being used that way now too)

Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-01-23 08:35:04 -08:00
Eric House
178156b7d7 Add UI to invite via SMS more than one player per device (if the 
"Advanced" option is enabled).
 2015-01-23 08:19:20 -08:00
Eric House
bfd6b2162d swap two config positions 2015-01-22 07:39:07 -08:00
Eric House
f8e530da9b Snapshot toward making SMS work again: invites now work via 
user-visible SMS, providing a URL same as email that launches the app
with a new game. Game works sending via NBS (data SMS) when both
devices are on GSM (T-mobile, anyway.) Plan is to use os version and
gsm info included in invite to warn user when the game can't
communicate, but that test isn't done yet. Also removed debug pref
allowing to force send by NBS.
 2015-01-18 10:49:15 -08:00
Eric House
e5ac525087 provide default default language name (and rename string constant 
being used that way now too)
 2015-01-16 21:28:59 -08:00
Eric House
306c9ef4b6 hide relay-related stuff when relay communication not enabled; remove 
sms status stuff altogether.
 2015-01-13 21:59:54 -08:00
Eric House
d1c300d752 string tweak 2015-01-13 21:51:27 -08:00
Eric House
7e28d2004b add button to game config activity for changing the connection types to be used in that game 2015-01-13 21:27:51 -08:00
Eric House
1139b1d5d1 put some space before all but the first heading 2015-01-13 19:42:19 -08:00
Eric House
50f29383f5 tweak invite message to not require all invitations to be sent at once 2015-01-05 07:41:31 -08:00
Eric House
6da1b54636 add preference controlling whether more than on player is invited per 
remote device
 2015-01-05 06:32:16 -08:00
Eric House
641d83ab48 use new game type icons 2015-01-03 15:17:12 -08:00
Eric House
4701fe2b90 pass in number of devices already connected so forceChannel can be set 
more correctly; put up alert when device rejects an invitation as a
duplicate.
 2015-01-03 09:50:07 -08:00
Eric House
a7cc96c697 add ability to invite more than one player per device. This is mostly 
for testing and needs to be hidden by an "advanced" pref so folks
don't stumble onto it. Works for BT (SMS will crash), but needs
cleaning up.
 2014-12-31 06:54:31 -08:00
Eric House
e8bb624b0b add preference checkbox for hiding newgame buttons (which are 
duplicated by menu items)
 2014-12-29 07:02:56 -08:00
Eric House
eac026a1a1 remove unused string 2014-11-25 07:18:16 -08:00
Eric House
80229376e9 include connection types string in header text 2014-11-21 08:02:55 -08:00
Eric House
d08a7f8d24 use a style for new game buttons 2014-11-20 19:12:56 -08:00
Eric House
a1bbbe3371 separate the new-game icons into two (as stubs) 2014-11-19 19:26:08 -08:00
Eric House
11f7083eb6 remove dead classes and layouts; add menu to create networked games. 2014-11-15 20:42:09 -08:00
Eric House
2465017e46 add buttons that create new games, bypassing the NewGame activity for 
a simpler experience.
 2014-11-15 17:59:59 -08:00
Eric House
2e8f4097d9 remove unused widget 2014-11-14 07:23:54 -08:00