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

4568 commits

Author SHA1 Message Date
Eric House
b3a2e28647 copy over from android_translate branch 2015-09-17 19:38:00 -07:00
Eric House
6f3b80cc68 catch up with recent changes 2015-09-17 07:11:39 -07:00
Eric House
3040d7f487 use new protocol for next release 2015-09-17 07:06:59 -07:00
Eric House
122335c53c Merge branch 'android_branch' into relay_noconn 
# 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-09-17 07:00:04 -07:00
Eric House
db1f569430 in chat window, don't show send menu item unless text is non-empty 2015-09-17 06:59:02 -07:00
Eric House
34ecd92ff5 script to copy translation data from android_translate branch 2015-09-16 07:01:09 -07:00
Eric House
6eb2e8e174 pull in latest French translation 2015-09-16 06:49:52 -07:00
Eric House
5d59bcd011 Revert to old proto since the version that's out there now won't work 
with the new. Can switch once this version's distributed.
 2015-09-16 06:42:01 -07:00
Eric House
f3d8f0b8ee pass V=1 to ndk build script to make cc calls verbose 2015-09-15 20:57:39 -07:00
Eric House
05d0974823 Merge remote-tracking branch 'origin/android_branch' into android_branch 
# 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-09-15 20:46:35 -07:00
Eric House
759cd36162 Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch 
Conflicts:
	xwords4/android/XWords4-dbg/AndroidManifest.xml
	xwords4/android/scripts/mkvariant.sh
 2015-09-10 18:34:28 -07:00
Eric House
1a258be2f4 merge in latest from android_translate branch 2015-08-27 21:57:19 -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
8e17e43d9a fix to not stop removing after removing the first elem 2015-08-27 06:41:47 -07:00
Eric House
db7aa3923b Merge branch 'android_branch' into relay_noconn 
# 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-08-26 07:09:56 -07:00
Eric House
a4e25576ad bring over changes from android_translate branch (via brute-force copy) 2015-08-26 07:00:54 -07:00
Eric House
83d3163f0e rename variable 2015-08-25 22:19:00 -07:00
Eric House
c3b2ecdb1d Merge branch 'android_branch' into relay_noconn 2015-08-25 06:46:35 -07:00
Eric House
9a75ef29f2 fix misspelling 2015-08-25 06:46:03 -07:00
Eric House
c81f035133 Merge branch 'android_branch' into relay_noconn 2015-08-25 06:40:42 -07:00
Eric House
26114f83a6 fix chat view not being opened if move had arrived after chat by 
removing unneeded variable whose presence was clearing flags.
 2015-08-25 06:38:14 -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
a073ad68ae add missing image 2015-08-24 07:42:36 -07:00
Eric House
690f248e27 ignore case where no files exist (so that /* doesn't expand) 2015-08-24 07:39:24 -07:00
Eric House
c35acdd773 ignore case where no files exist (so that /* doesn't expand) 2015-08-24 07:35:00 -07:00
Eric House
daaa346bb5 generate local.properties if running for first time 2015-08-24 07:24:28 -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
6d6c345f94 Merge branch 'android_branch' into relay_noconn 
# 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-08-23 21:18:05 -07:00
Sylvie
ec3af948e3 Translated using Weblate (Dutch) 
Currently translated at 100.0% (691 of 691 strings)
 2015-08-23 21:17:16 -07:00
Joan Montané
ab791fb430 Translated using Weblate (Catalan) 
Currently translated at 100.0% (691 of 691 strings)
 2015-08-23 21:14:34 -07:00
Bernard Massot
8da25dcdd4 Translated using Weblate (French) 
Currently translated at 100.0% (691 of 691 strings)
 2015-08-23 21:14:20 -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
e0327b0f62 ignore files 2015-08-20 07:41:48 -07:00
Eric House
79ab1214e7 replace send button with menuitem, and add icons for it and clear 2015-08-20 07:38:09 -07:00
Eric House
6b455bf743 make chat compose space multi-line; scroll chat history to bottom on 
open
 2015-08-20 07:37:51 -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
d08e82220d replace send button with menuitem, and add icons for it and clear 2015-08-20 07:35:01 -07:00
Eric House
ec6b7207b4 make chat compose space multi-line; scroll chat history to bottom on 
open
 2015-08-20 07:15:20 -07:00
Eric House
f4b39287a5 confirm before deleting chat history 2015-08-20 07:03:21 -07:00
Eric House
e5cf0ee4fb Merge branch 'android_branch' into relay_noconn 
# 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-08-19 07:44:17 -07:00
Eric House
a11e5beded goes with prev commit 2015-08-18 06:41:57 -07:00
Eric House
ff3d587179 really only post messages sent toast when user chose the menuitem 2015-08-18 06:41:34 -07:00
Eric House
aee4d9d6a4 goes with prev commit 2015-08-18 06:40:50 -07:00
Eric House
1703a15aca really only post messages sent toast when user chose the menuitem 2015-08-18 06:40:31 -07:00
Eric House
0d8fef5c56 cleanup 2015-08-17 08:01:36 -07:00
Eric House
0d04b176d2 catch up generated strings 2015-08-17 07:13:02 -07:00
Eric House
592f01a767 Merge branch 'android_branch' into relay_noconn 
# 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-08-17 07:07:59 -07:00
Eric House
cbe2c6f5f3 copy over new translations from translation branch. 2015-08-17 07:04:10 -07:00
Eric House
f5e645f62a Merge branch 'android_branch' into relay_noconn 
# 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-08-17 06:41:58 -07:00
Eric House
55d67f7599 don't show toast after message send unless user-triggered 2015-08-17 06:34:58 -07:00
Eric House
8065e55b98 pipe board_getSelPlayer() through jni 2015-08-16 09:38:55 -07:00
Eric House
f7f4825c67 deal with case where file doesn't exist 2015-08-16 09:25:00 -07:00
Eric House
81a6d42279 fix version code 2015-08-16 09:24:42 -07:00
Eric House
3898a85f18 catch version code up 2015-08-13 07:34:34 -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
34c70825b9 toward figuring out why relay communication stalls: log network 
availability state changes.
 2015-08-13 07:06:12 -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
dea75a815e vary common-code logging tag by variant 2015-08-13 07:02:57 -07:00
Eric House
7824df67f5 copy over VARIANT compile-time flag stuff. Not sure how it got dropped 
in this branch.
 2015-08-13 06:54:07 -07:00
Eric House
19eb677f7c copy over from android_translate branch 2015-08-12 21:36:33 -07:00
Eric House
bae6b3f119 copy over from android_translate branch 2015-08-12 21:34:46 -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
4e1a382f1e Merge branch 'android_branch' into relay_noconn 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
 2015-08-11 07:42:05 -07:00
Eric House
be9b8977e5 turn off email invite attachments 2015-08-11 07:30:34 -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
265ac48b88 Merge branch 'android_branch' into relay_noconn 
Conflicts:
	xwords4/android/XWords4-dbg/AndroidManifest.xml
	xwords4/android/XWords4-dbg/res/layout/.gitignore
	xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
 2015-08-10 07:37:03 -07:00
Eric House
00e6a80fb0 fix permission and other constants that need to be different in variant 2015-08-10 07:07:33 -07:00
Eric House
1d14d4cc65 ignore new files 2015-08-10 06:52:31 -07:00
Eric House
c3aeefe706 bring over changes for permissions etc 2015-08-10 06:52:19 -07:00
Eric House
2ef407320e pick package based on location 2015-08-10 06:43:19 -07:00
Eric House
87e3108296 cleanup: make work based on location if target not specified 2015-08-10 06:23:24 -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
134ef851f6 generate local.properties if running for first time 2015-08-06 21:01:15 -07:00
Eric House
8b90f211ed progress: compares english and other languages use of format 
specifiers, but I think is missing mismatches in plurals still.
 2015-08-05 07:19:39 -07:00
Eric House
ec581d1dbd Merge branch 'android_branch' into relay_noconn 
Conflicts:
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/jni/Android.mk
	xwords4/android/XWords4/jni/xwjni.c
	xwords4/android/XWords4/res/values/common_rsrc.xml
 2015-08-04 20:17:56 -07:00
Eric House
97ebdd0d63 copy changes over from android_translate branch 2015-08-04 20:15:38 -07:00
Eric House
adceab1ed1 name change 2015-08-04 20:15:00 -07:00
Eric House
debe424c8a copy over from android_translate branch 2015-08-04 20:13:19 -07:00
Eric House
a45b698ea9 don't crash when first run without network connection 2015-08-03 05:25:35 -07:00
Eric House
bcd620a4f9 clean up to make cherry-picked changes work 2015-08-03 05:07:49 -07:00
Eric House
cfa101350a add logdf, logging for DEBUG builds only 2015-08-03 05:06:38 -07:00
Eric House
a612a89ac6 fix variant crashes: had forgotten PKG_PATH on new method 2015-08-03 04:59:15 -07:00
Eric House
97bf616db1 Problem: NBS port is being ignored by dispatcher to broadcast 
receivers on receiving device, so variants are getting their own and
all other NBS messages. Solution: change protocol to include port
message is meant for so mis-delivered ones can be dropped.
 2015-08-03 04:58:46 -07:00
Eric House
c83d3368ad allow using script for any project with an AndroidManifest.xml 2015-08-03 04:58:34 -07:00
Eric House
1e7f51a88d move last-pressed button to bottom of screen where it's natural to look for it 2015-08-03 04:58:18 -07:00
Eric House
a5f332dd1d different logging TAG for different variants 2015-08-03 04:57:35 -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
1959ff3b2d fix NPE reported by crittercism 2015-08-03 04:54:42 -07:00
Eric House
b500a4646d use different uuid for dbg variant so it's not cross-sending BT 
messages with other variants, causing among other problems spurious
"deleted on other device" warnings.
 2015-08-03 04:50:56 -07:00
Eric House
b56924b030 fix off-by-one error that probably had me slowly leaking local obj 
references for the last few years.
 2015-08-02 16:43:52 -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
a349ab4bee add commented-out getClassName() in case it's useful in the future. 2015-08-02 16:41:28 -07:00
Eric House
b3ca4ee223 fix off-by-one error that probably had me slowly leaking local obj 
references for the last few years.
 2015-08-02 16:29:53 -07:00
Eric House
56082d2f7b fix variant crashes: had forgotten PKG_PATH on new method 2015-08-02 16:15:32 -07:00