Commit graph

871 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
fb13c949e8 re-enable ActionPairs stuff now that an additional button works/fits. 2015-01-27 08:14:06 -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
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
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