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
9856 commits 21 branches 243 tags 33 MiB
Commit graph

215 commits

Author SHA1 Message Date
Eric House
3a32d3a17b return count of messages sent from comms_resendAll(), and post it as a 
toast so user sees something happened.
 2015-08-13 07:05:06 -07:00
Eric House
b2970069c1 add index of sending player to chat transmission, and on receiving 
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.

Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-08-12 07:38:18 -07:00
Eric House
8f7267b3ec add index of sending player to chat transmission, and on receiving 
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.
 2015-08-12 07:36:36 -07:00
Eric House
ef853d2784 cleanup; include generated file 2015-08-11 07:11:03 -07:00
Eric House
5bae2dbbd9 experimental option that puts invite url text into clipboard so user 
can invite using app of her choice.

Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
	xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
 2015-08-07 08:00:12 -07:00
Eric House
bcd620a4f9 clean up to make cherry-picked changes work 2015-08-03 05:07:49 -07:00
Eric House
3c58267d4e goes with cherrypick 2015-07-26 12:09:51 -07:00
Eric House
fa00eef151 convert string to plurals and add some "one" items to others to allow 
removing [s]. There's more to do still.
 2015-07-23 06:57:37 -07:00
Eric House
5e63d03e76 apparently I forgot to check this in 2015-07-11 08:23:22 -07:00
Eric House
63aae3d4e8 add newbie hints to checkboxes enabling communication types (bt, sms, 
etc.)
 2015-06-25 06:38:40 -07:00
Eric House
b8193d635d SMS-enable alert: Add cancel button, and disable OK button until user 
selects an enabling option
 2015-06-23 08:11:18 -07:00
Eric House
54b18c898d more, and hopefully last, French strings 2015-06-19 20:52:40 -07:00
Eric House
8354f45548 deal with case where invitation includes only conntypes not supported 
on device, e.g. sms-only sent to a tablet. Strip the unsupported types
when creating the game, and then on game open suggest to user he
delete (with explanation)
 2015-06-19 07:51:51 -07:00
Eric House
f93f0cd926 Yet another attempt to deal with bad connectivity: when can't connect 
to relay but other address modes are present, offer to remove the
relay from the game, and if that choice is taken confirm with an
explanation of the limits of what remains.
 2015-06-18 08:14:33 -07:00
Eric House
13f4e66f84 More French strings, and fix typo in English 2015-06-16 06:45:23 -07:00
Eric House
4251d08248 generated strings 2015-06-13 07:39:29 -07:00
Eric House
f296ab4dc3 add additional warning about failure to connect when user's on WiFi, 
since paranoid WiFi settings are probably a leading cause of my not
being able to connect.
 2015-06-08 07:36:47 -07:00
Eric House
d0d81483e3 When relay-configured game is opened that hasn't yet managed to 
connect to relay, instead of suggesting user invite another player
warn him/her that it's unconnected and suggest opening again
later. The problem this addresses is that a game must be opened to
make the initial relay connection, and that doesn't happen in the
background. This is a temporary fix that should prevent sending
invitations to games that the relay doesn't yet know about.
 2015-06-05 22:12:08 -07:00
Eric House
2f93760c6e generated strings from last commit 2015-06-05 06:28:48 -07:00
Eric House
276666dd1a add progress to initial fetch of dict info from server for non-English 
devices
 2015-06-03 07:50:38 -07:00
Eric House
dd24f86eb8 use android's build-in OK and Cancel strings 2015-05-27 07:05:59 -07:00
Eric House
ac2d46d109 Don't show network status icon, nor respond to taps, for standalone 
games.
 2015-05-21 07:09:54 -07:00
Eric House
3e077a2dc2 remove unused string 2015-05-14 06:21:12 -07:00
Eric House
e66260950e change final score formatting so it can be properly localized. 
Note: because the substitution is done in common code I can't use the
positional specifiers (%1$s vs %s) and so this breaks the generated
"translations". The scripts that do the generation need to be fixed to
understand the formatted="false" attribute.
 2015-05-13 07:51:32 -07:00
Eric House
5bba268ede change I apparently should have committed earlier 2015-05-05 07:11:38 -07:00
Eric House
75bb77b901 generated files 2015-04-02 07:19:14 -07:00
Eric House
34f1d4aeeb fix some confusion between language name used as key (unlocalized 
value that should have been the iso standard two-letter code) and
localized language name, including subclass of ArrayAdapter that keeps
a hash from visible/localized language and the corresponding code.
 2015-04-01 07:45:04 -07:00
Eric House
0df1e696f8 more translated strings 2015-03-31 20:40:45 -07:00
Eric House
c2179664d8 make some debug strings localizable 2015-03-30 19:34:38 -07:00
Eric House
c330b53d89 add a "do not show again" checkbox to confirmThen alerts, and use it 
to offer that option to the alert asking if you want to download the
wordlist for your phone's language.
 2015-03-30 19:23:12 -07:00
Eric House
e1f0c176d5 confirm before downloading wordlist, and only check-and-offer once. 2015-03-30 08:04:37 -07:00
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
10fe016785 tweaks to strings.xml copying: add comment warning files are 
generated, and don't copy over strings that say "XLATE ME"
 2015-03-27 21:37:29 -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
1cd450bb7b use <plurals> for dictionary deletion string 2015-03-25 04:52:02 -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
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
4718056344 more French strings 2015-03-12 21:14:55 -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
78f8b2aff4 include comments from French file -- work in progress 2015-03-10 07:42:05 -07:00
Eric House
6466f1aff9 more French translations 2015-03-10 07:13:54 -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
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
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
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
749b9a5c19 changes in generated IDs: apparently different dev machines generate 
different IDs, perhaps because they're running different SDK versions.
 2015-02-17 06:52:36 -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
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
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
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
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
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
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
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
6da1b54636 add preference controlling whether more than on player is invited per 
remote device
 2015-01-05 06:32:16 -08:00
Eric House
ddd1efd8dd modify new game actionbar icons to derive from game status icons 2015-01-03 16:44:13 -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
c3ca257a10 oops: new style 2014-11-20 19:13:15 -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
f625332782 add preference (dialog) to set default address types. Not used yet, 
and still ugly.
 2014-11-13 07:27:29 -08:00
Eric House
3024bcbd50 get rid of bt and sms new game options 2014-10-27 19:12:38 -07:00
Eric House
93f0b626af snapshot: invite sent by NFC connects two devices using relay with BT 
ability passed too (though not yet used.)
 2014-10-27 07:51:25 -07:00
Eric House
51a1ddfe39 include robot name in report of his score 2014-10-23 06:32:24 -07:00
Eric House
8486bad44b add default robot name to prefs 2014-10-23 06:21:16 -07:00