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

940 commits

Author SHA1 Message Date
Eric House
f29d302f06 implement context menus for group items too, and add select/deselect 
items for both -- for groups because there's no other way to select
now. Still not sure how to educate users about the change or to
provide a choice (if it's worth doing).
 2015-10-21 06:31:09 -07:00
Eric House
1da2dd5330 snapshot of effort to add listing of previous opponent devices to be 
invited. So far it creates the list of devices ok, and inviting from
it works, but they're not yet named, and the list isn't persisted.
 2015-10-15 06:44:10 -07:00
Eric House
77c92ac4f3 improve a couple of plurals elements 2015-09-30 06:54:33 -07:00
Eric House
d79ecfaf30 update URL for Catalan/DISC word lookup, from the maintainer. 2015-09-28 06:54:53 -07:00
Eric House
e9059cba47 provide default rematch game name that makes sense on both devices 2015-09-24 20:26:43 -07:00
Eric House
7783021fd7 give player a chance to name rematch game, and provide default that 
includes opponent's name
 2015-09-23 07:53:49 -07:00
Eric House
a2fb6045a8 tweak move reminder strings 2015-09-22 20:21:58 -07:00
Eric House
b3a93cc474 Make separate turn reminder disable prefs for solo and networked 
games, as some folks playing against the robot don't need to be
reminded. From a feature request submitted via sourceforge.
 2015-09-22 07:35:02 -07:00
Eric House
be44613773 Merge branch 'android_branch' into relay_noconn 
Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-08-27 07:53:14 -07:00
Eric House
53025f8a99 clean up plurals, adding quantity="one" elements in a few places where 
they make sense, collapsing a plurals to a string where that made
sense (there will probably never be a one-word wordlist), and removing
an unused plurals.
 2015-08-27 07:42:16 -07:00
Eric House
c81f035133 Merge branch 'android_branch' into relay_noconn 2015-08-25 06:40:42 -07:00
Eric House
2aa9740814 up strings and changelog for new release 2015-08-25 05:24:58 -07:00
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
07e97107ce confirm before deleting chat history 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2015-08-20 07:37:30 -07:00
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
bcd620a4f9 clean up to make cherry-picked changes work 2015-08-03 05:07:49 -07:00
Eric House
6871ef24a6 move several strings, including app name, NBS port, and url prefix, into generated 
.xml file so Dbg and regular variants can co-exist better

Conflicts:
	xwords4/android/XWords4/archive/R.java
 2015-08-03 04:55:59 -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
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
7c8c6bb55b move app name into resource that's not copied to fix dbg variant 
having empty name (though it didn't before)
 2015-07-25 08:52:33 -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