Commit graph

179 commits

Author SHA1 Message Date
Eric House
b79836c61b Merge branch 'android_branch' into relay_noconn
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
2015-08-24 07:52:46 -07:00
Eric House
5fd477be75 use existing string -- Copy to clipboard 2015-08-23 21:52:07 -07:00
Eric House
98bd41bc14 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-23 21:44:45 -07:00
Eric House
1df48d2792 Merge branch 'android_branch' into relay_noconn
Conflicts:
	xwords4/android/XWords4/archive/R.java
	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
2015-08-21 07:17:31 -07:00
Eric House
8f93630350 shorten string to make action bar more obvious (and catch up with
generated string file changes)
2015-08-21 06:56:47 -07:00
Eric House
0d04b176d2 catch up generated strings 2015-08-17 07:13:02 -07:00
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
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
5853b0c5c6 Show specific notification on receipt of chat, not rehash of last move
played.
2015-08-11 06:47:10 -07:00
Eric House
bcd620a4f9 clean up to make cherry-picked changes work 2015-08-03 05:07:49 -07:00
Eric House
a148680e44 catch up: it's been a few commits since I included this. 2015-08-02 16:43:23 -07:00
Eric House
0425df7a5e move several strings, including app name, NBS port, and url prefix, into generated
.xml file so Dbg and regular variants can co-exist better
2015-08-01 22:39:00 -07:00
Eric House
2dc536dfeb change button text to Wait (per Kati) 2015-07-30 06:36:47 -07:00
Eric House
037cc73f3e add rematch menu item shown whenever the game's finished (but not
shown for games with > 2 players.
2015-07-27 06:26:28 -07:00
Eric House
3c58267d4e goes with cherrypick 2015-07-26 12:09:51 -07:00
Eric House
d4e5c9dfdf convert string to plurals and add some "one" items to others to allow
removing [s]. There's more to do still.

Conflicts:
	xwords4/android/XWords4/archive/R.java
	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/SMSInviteDelegate.java
2015-07-23 07:03:47 -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
d77914d216 add debug option to allow device to send relay-invitation to
itself. When that's set, in inviter UI add a button that adds own
relayID to the list (gross!, but how that whole thing works is TBD),
and when receiving invitation don't drop it if there's already a game
with the same ID.
2015-07-12 20:49:53 -07:00
Eric House
7ac5d2259d add explanation for why rematch doesn't work for games with more than
two players. (The hard part is really more than two devices, but I bet
two players per device in networked games is rarest of all.)
2015-07-11 17:06:13 -07:00
Eric House
5dc8291981 show a toast when hint can't find anything, on the principle that user
should see some response to every action.
2015-07-11 16:24:21 -07:00
Eric House
fb80032b38 funnel invitation notifications from all three channels into same
method: only difference between them is the body.
2015-07-11 15:47:35 -07:00
Eric House
d6651a0404 show relay DevID in debug section of prefs 2015-07-11 11:26:03 -07:00
Eric House
5e63d03e76 apparently I forgot to check this in 2015-07-11 08:23:22 -07:00
Eric House
b5ae54f313 use common/native NetLaunchInfo to implement invite-via-relay that
works between linux and Android clients. Required renaming so struct
names and names of fields within match in c and java code. The point
is to test this as the foundation of rematch: now you have to type in
a deviceID in order to invite, which clearly sucks for users. Either
that goes away, or it's replaced with something that scans existing
games and lists past opponents as possible invitees.
2015-07-10 23:19:38 -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