Commit graph

706 commits

Author SHA1 Message Date
Eric House
f4b39287a5 confirm before deleting chat history 2015-08-20 07:03:21 -07:00
Eric House
389a09ac1a 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-13 07:30:55 -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
47954f82d0 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:43:20 -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
4a28da1348 Show specific notification on receipt of chat, not rehash of last move
played.

Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
2015-08-11 06:50:16 -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
c99decaf32 experimental option that puts invite url text into clipboard so user
can invite using app of her choice.
2015-08-07 07:55:26 -07:00
Eric House
2dc536dfeb change button text to Wait (per Kati) 2015-07-30 06:36:47 -07:00
Eric House
0b9e53df96 Fix misspelling. Thanks Frank. :-) 2015-07-26 22:24:16 -07:00
Eric House
0bb51e8b93 show a toast when hint can't find anything, on the principle that user
should see some response to every action.

Conflicts:
	xwords4/android/XWords4/archive/R.java
2015-07-26 12:09:15 -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
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
8a575bc789 fill in help text for communication means 2015-06-26 06:18:42 -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
7190706eaf when game doesn't have connection to relay but has another way to
connect, give user the option of inviting "anyway", but warn that
there will be no relay connection used in that game. And then remove
the relay addressing from the invitation info.
2015-06-13 07:35:02 -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
6bfb20d2f0 feature request: show toast after writing to DB so user knows
something was done
2015-06-05 06:20:43 -07:00
Eric House
8e2d19e712 tweak string 2015-06-03 07:58:49 -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
b618091c0f tweak menu text 2015-04-06 07:01:19 -07:00
Eric House
6a74cdba44 make description of human and robot wordlists in prefs localizable 2015-04-02 06:47:35 -07:00
Eric House
c2179664d8 make some debug strings localizable 2015-03-30 19:34:38 -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
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
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
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