Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-08 05:24:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
9368 commits 21 branches 243 tags 33 MiB
Commit graph

9270 commits

Author SHA1 Message Date
Eric House
db9c079356 fix to show files appearing in only one apk 2015-12-05 11:13:13 -08:00
Eric House
4e14477faf script to compare .apk files, meant to aid in confirming that gradle 
and ant are producing the same thing.
 2015-12-04 21:51:10 -08:00
Eric House
9d42d76ae0 collapse a couple of list-specific classes into their superclasses. 2015-11-24 08:15:27 -08:00
Eric House
87edd09ab6 Cleanup: get rid of ListActivity. Eventually all Activities need to 
inherit from FragmentActivity since there's no List-aware equivalent,
so XWListActivity now extends XWActivity and nearly all its methods go
away. getListView() and friends are all I needed to implement --
apparently.
 2015-11-24 08:01:16 -08:00
Eric House
e3e4ebd7de changes AS made 2015-11-23 07:51:54 -08:00
Eric House
97f24973e4 Rather than ask player for name on app install, ask every time he 
creates a new game (but with a don't-ask-again check to avoid
annoying.) Make changes to DlgDelegate to support.
 2015-11-23 07:51:31 -08:00
Eric House
0b0bd02e79 remove logging 2015-11-20 23:15:24 -08:00
Eric House
d468866a01 no more variables called socket; all are "sock" now. 2015-11-20 23:15:04 -08:00
Eric House
b7b664bee6 rename .apks to match the ant ones, including git revision info 2015-11-18 21:28:56 -08:00
Eric House
dc5b979e8a including .apk signing, and turn on proguard, for release gradle builds 2015-11-18 06:27:11 -08:00
Eric House
e0cb84a332 AS changes -- should I be tracking these files? 2015-11-17 07:37:21 -08:00
Eric House
8626fdf027 refactor: move inline tests for being on emulator into a static method 2015-11-17 07:19:37 -08:00
Eric House
a2e00794fa some stuff AS changed. I hope it stops doing this eventually 2015-11-12 07:30:09 -08:00
Eric House
6d948a33dd name debug .apk using my convention, to include git rev 2015-11-12 07:29:49 -08:00
Eric House
58bf3ba07b Merge remote-tracking branch 'maidu2/android_branch' into android_branch 
Conflicts:
	xwords4/android/XWords4/.gitignore
	xwords4/android/XWords4/build.gradle
	xwords4/android/scripts/common_targets.xml
 2015-11-11 22:36:19 -08:00
Eric House
aa11bb50de fix to work with modified script 2015-11-11 22:23:39 -08:00
Eric House
2f4fe1de72 some AS changes when run the first time. Source-level debugging of 
java works!
 2015-11-11 19:04:58 -08:00
Eric House
adbc3615c1 changes to run under gradle 2015-11-11 18:59:00 -08:00
Eric House
ca83f2ab8b add exactly as came from modified sample app 2015-11-11 18:55:24 -08:00
Mario Frasca
0d688ab80e Translated using Weblate (Slovak) 
Currently translated at 69.0% (476 of 689 strings)
 2015-11-09 21:45:04 +01:00
Eric House
46cb5404d0 fix so debug and release builds have the right setting passed to 
ndk-build and keep their .o and .so files separate.
 2015-11-06 21:10:45 -08:00
Eric House
9f28e5c350 more gradle improvements. Seems to build a usable .apk, but isn't 
doing release/debug right yet.
 2015-11-05 20:19:07 -08:00
Eric House
7aff11d7b0 files necessary for a gradle build (untested; need to commit and clone 
elsewhere to be sure). I'm not moving things to the conventional
gradle locations yet -- want to keep the ant build working too for
now.
 2015-11-04 06:28:57 -08:00
naofum
6a5462194e Translated using Weblate (Japanese) 
Currently translated at 100.0% (689 of 689 strings)
 2015-11-04 09:44:43 +01:00
naofum
153f6a75c3 Translated using Weblate (Japanese) 
Currently translated at 100.0% (689 of 689 strings)
 2015-10-31 07:47:53 +01:00
Eric House
5d82636c26 allow using env variables in ant files 2015-10-30 05:42:27 -07:00
Eric House
6f1235492d disable local-game reminders by default 2015-10-29 07:31:21 -07:00
Eric House
2f579832b4 trivial refactor 2015-10-29 07:02:18 -07:00
Eric House
77315b50ba changes in players matter for local games too 2015-10-29 07:01:01 -07:00
Eric House
67fb55ccf2 Clear thumbnail when saving changes. Not sure this is the best place 
to do it, but it fixes the problem I'm after.
 2015-10-29 07:00:22 -07:00
Eric House
c581bb93ad change default to checked so code doesn't have to set it 2015-10-29 06:32:18 -07:00
Eric House
83baa5a00c don't allow removing players when game is locked 2015-10-29 06:31:32 -07:00
Eric House
3b6a0cda74 Don't keep game locked the whole time config activity is open: lock to 
load, then again if needed to save.
 2015-10-27 19:18:10 -07:00
Eric House
a2a073067c fix assertion due to lock conflict between game config and context 
menu updating by having updating not insist on getting the lock.
 2015-10-27 07:32:18 -07:00
Eric House
59d01dc6a2 cleanup debug stack printing 2015-10-27 07:26:06 -07:00
Eric House
564b682e64 fix to correctly show stack of lock owner (in debug mode) 2015-10-27 07:25:42 -07:00
Eric House
4e7b2dc727 implement rematch menu: create a new game that will invite when opened 2015-10-27 06:22:52 -07:00
Luiz Wagner Tavares Nascimento
5737277444 Translated using Weblate (Portuguese) 
Currently translated at 61.6% (425 of 689 strings)
 2015-10-26 03:44:54 +01:00
Eric House
ddc9c5f920 beginning of rematch menu: enabled correctly, but not yet handled 2015-10-23 05:41:20 -07:00
Eric House
5886394fd7 move menus 2015-10-23 05:26:14 -07:00
Eric House
082b0e06ac tweak <one> elements to not substitute in the digit 2015-10-22 06:31:58 -07:00
Eric House
2c558ab905 Turn off relay invite. I want to get a release out before I'm like to 
resolve all issues.
 2015-10-22 06:30:19 -07:00
Eric House
058be41265 change file name 2015-10-22 06:18:47 -07:00
naofum
aac42ef39a Translated using Weblate (Japanese) 
Currently translated at 32.3% (223 of 689 strings)
 2015-10-22 12:44:42 +02:00
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
6aa994e2c6 first cut at putting back context menus. For games only (not groups), 
and done by duplicating the .xml file. TODO: support groups, unify
menu .xml files, and have a user preference controlling whether
context menus are available or at least a newbie info explaining the
change.
 2015-10-20 06:21:43 -07:00
Michal Čihař
0e2f465173 Translated using Weblate (Czech) 
Currently translated at 19.4% (134 of 689 strings)
 2015-10-19 09:44:12 +02:00
Eric House
a02ca24ab4 remove buttons I'm not using, and put the final action button at the bottom 2015-10-15 06:46:53 -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
27312f7853 add comment 2015-10-15 06:32:47 -07:00
Eric House
5d81b3375b add support for fetching devIDs for connnames, required to allow 
inviting based on existing relay games.
 2015-10-15 06:32:11 -07:00
Eric House
9d795ff01d Makefile to build new "zinga" wordlist, and config changes to include 
all letters, including those for which there are no tiles.
 2015-10-12 21:42:22 -07:00
Eric House
590ae6bd8c fix test to hide menu when it'll otherwise cause an array 
out-of-bounds exception. Thanks Aidan.
 2015-10-07 08:06:26 -07:00
naofum
6d88d56c40 Translated using Weblate (Japanese) 
Currently translated at 100% (0 of 0 strings)

Created new translation.
 2015-10-04 16:12:50 +02:00
Eric House
77c92ac4f3 improve a couple of plurals elements 2015-09-30 06:54:33 -07:00
Eric House
4c1786e65b remove unused imports 2015-09-30 06:54:07 -07:00
Eric House
87517edd6f fix counting of messages sent by "Resend messages" menuitem: actually 
count them, and do so based on new msgNo passed from comms that's
concatenation of channelNo and msgID so that duplicates (over multiple
transports) aren't counted twice.
 2015-09-30 06:50:04 -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
f363fadf39 fix, by inspection, NPE reported through the Play Store. 2015-09-28 06:46:37 -07:00
Eric House
e9059cba47 provide default rematch game name that makes sense on both devices 2015-09-24 20:26:43 -07:00
Weblate
d14a053e70 Merge remote-tracking branch 'origin/android_translate' into android_translate 2015-09-24 20:54:40 +02:00
Eric House
8a3bc943c8 give user a chance to name game during rematch of solo games too 2015-09-24 06:51:55 -07:00
Eric House
5e3ae54e2e cleanup 2015-09-24 06:50:26 -07:00
Eric House
37094b72f3 fix crash, and clean up rematch game naming code. Deals with solo 
games too though not used.
 2015-09-23 19:11:43 -07:00
Eric House
873e0c7e92 make dbg variant "debuggable" 2015-09-23 19:01:21 -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
b73b29fcca log what's sent too -- for debugging update process 2015-09-22 20:39:37 -07:00
Eric House
8a2ca8195e log bad json data 2015-09-22 20:23:08 -07:00
Eric House
a2fb6045a8 tweak move reminder strings 2015-09-22 20:21:58 -07:00
Eric House
bfce38c088 use a hash map instead of a bunch of str-compares. 2015-09-22 20:18:27 -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
32cd08b1dc oops: include new URL in note 2015-09-22 07:23:19 -07:00
Eric House
ccab839e66 change for new list, and also to use format better suited for keeping 
wordlists in git.
 2015-09-22 07:10:25 -07:00
Joan Montané
5f3a029ff7 Translated using Weblate (Catalan) 
Currently translated at 100.0% (689 of 689 strings)
 2015-09-22 00:09:57 +02:00
Sylvie
757add997b Translated using Weblate (Dutch) 
Currently translated at 100.0% (689 of 689 strings)
 2015-09-21 18:44:15 +02:00
Eric House
cb1d7dff71 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-21 07:14:01 -07:00
Eric House
b3a2e28647 copy over from android_translate branch 2015-09-17 19:38:00 -07:00
Eric House
311015103e Merge remote-tracking branch 'weblate/android_translate' into android_translate 
# 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 19:36:18 -07:00
Sylvie
b30822e488 Translated using Weblate (Dutch) 
Currently translated at 100.0% (689 of 689 strings)
 2015-09-17 16:58:43 +02:00
Eric House
6f3b80cc68 catch up with recent changes 2015-09-17 07:11:39 -07:00
Eric House
81b8f9bcf6 Merge branch 'android_branch' into android_translate 
# 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:09:44 -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
b8822f72bc Change return types to match recent signature change. Apparently the 
NDK's compiler is configured to be stricter than Ubuntu's.
 2015-09-17 06:51:15 -07:00
Eric House
a9ddf98541 Merge branch 'android_branch' into android_translate 2015-09-16 07:08:53 -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
0ce2d50504 merge latest French translation 2015-09-16 06:47:46 -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
cba1293bec make return value void since it's never used 2015-09-15 20:54:01 -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
c8fcc32c2c When two moves are identical (i.e. a one-letter word that forms two 
words words) drop one when looking for hints
 2015-09-14 08:49:52 -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
2d0dc6e192 Merge remote-tracking branch 'weblate/android_translate' into android_translate 
Conflicts:
	xwords4/android/XWords4/res_src/values-fr/strings.xml
 2015-08-27 21:55:08 -07:00
Bernard Massot
a09e60d06e Translated using Weblate (French) 
Currently translated at 99.8% (689 of 690 strings)
 2015-08-27 19:39:09 +02: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
75eb955050 Merge branch 'android_branch' into android_translate 
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-27 07:46:45 -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
47f8bd8125 Merge branch 'android_branch' into android_translate 2015-08-27 06:42:44 -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
0e3044bb16 fix what looks like a weblate bug: replace empty <other> elem with 
what was there before.
 2015-08-26 06:49:15 -07:00
Weblate
d1b25999a3 Merge remote-tracking branch 'origin/android_translate' into android_translate 2015-08-26 07:42:41 +02:00
Bernard Massot
0b1ba099e2 Translated using Weblate (French) 
Currently translated at 100.0% (691 of 691 strings)
 2015-08-26 07:42:41 +02: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
41817d896c Merge branch 'android_branch' into android_translate 
# 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-25 06:39:14 -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
be64f78252 Merge branch 'android_branch' into android_translate 
# 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-24 07:44:58 -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
bb2ea6a522 remove duplicate strings (likely added by merge when I wasn't paying attention) 2015-08-24 07:17:50 -07:00
Eric House
11aae82051 Merge branch 'android_branch' into android_translate 
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/DlgDelegate.java
 2015-08-23 21:54:18 -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
Joan Montané
36689676c5 Translated using Weblate (Catalan) 
Currently translated at 100.0% (691 of 691 strings)
 2015-08-23 23:13:35 +02:00
Bernard Massot
2b29ec82fe Translated using Weblate (French) 
Currently translated at 100.0% (691 of 691 strings)
 2015-08-23 21:19:03 +02:00
Sylvie
407d96e343 Translated using Weblate (Dutch) 
Currently translated at 100.0% (691 of 691 strings)
 2015-08-21 17:22:31 +02: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
598ee7599b Merge branch 'android_branch' into android_translate 
Conflicts:
	xwords4/android/XWords4/res/values/strings.xml
 2015-08-20 07:43:16 -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
255ca56ed7 when no moves found, reset engine and try again. Works around bug 
where you do "hint", then "prev hint" and get told there are no moves
found only to have the next "prev hint" succeed. This is a hack, but
the right fix is eluding me, and will certainly be riskier.
 2015-08-19 07:43:00 -07:00
Eric House
6d7123c27a fix curses app for standalone games (at least to not crash) 2015-08-19 06:05:18 -07:00
Eric House
884eda0603 cleanup: use temp ptr to avoid too many dereferences 2015-08-18 08:00:22 -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
6ae73ab99b Merge branch 'android_branch' into android_translate 
Conflicts:
	xwords4/android/XWords4/res_src/values-nl/strings.xml
 2015-08-17 07:05:58 -07:00
Eric House
cbe2c6f5f3 copy over new translations from translation branch. 2015-08-17 07:04:10 -07:00
Eric House
d6d1bbe2e0 Merge remote-tracking branch 'weblate/android_translate' into android_translate 
# 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:46:55 -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
4b14176386 Merge branch 'android_branch' into android_translate 
# 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:35:41 -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
01b746860e add accessor for current selected player 2015-08-16 09:26:48 -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
Sylvie
29f410a2e0 Translated using Weblate (Dutch) 
Currently translated at 100.0% (688 of 688 strings)
 2015-08-14 16:11:02 +02:00
Joan Montané
fe86eb9dbf Translated using Weblate (Catalan) 
Currently translated at 100.0% (688 of 688 strings)
 2015-08-14 12:17:17 +02:00
Eric House
214c503440 Merge branch 'android_branch' into android_translate 
# 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-13 07:35:50 -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
fd55d27a63 changes left out of previous merge commit for some reason 2015-08-13 07:24:49 -07:00
Eric House
0c39c61725 Merge branch 'android_branch' into android_translate 
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:24:05 -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
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
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
49e2503146 Merge branch 'android_branch' into android_translate 2015-08-11 07:31:06 -07:00
Eric House
be9b8977e5 turn off email invite attachments 2015-08-11 07:30:34 -07:00
Eric House
ef853d2784 cleanup; include generated file 2015-08-11 07:11:03 -07:00
Eric House
b7cb902775 Merge remote-tracking branch 'weblate/android_translate' into android_translate 2015-08-11 07:01:03 -07:00
Eric House
5d2a5b7649 Merge branch 'android_branch' into android_translate 2015-08-11 06:57:27 -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
Sylvie
28bb7f84be Translated using Weblate (Dutch) 
Currently translated at 100.0% (687 of 687 strings)
 2015-08-11 12:48:40 +02: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
4d4c3d99b7 Merge branch 'android_branch' into android_translate 2015-08-10 07:08: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
3eb1dbe9c6 Merge remote-tracking branch 'weblate/android_translate' into android_translate 2015-08-10 06:58:11 -07:00
Eric House
a320c81009 Merge branch 'android_branch' into android_translate 
Conflicts:
	xwords4/android/XWords4/res_src/values-ca/strings.xml
	xwords4/android/scripts/fix-loc-xmls.py
 2015-08-10 06:56:31 -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
517cfe6fda bring over saved file format change from relay_conn branch so builds 
from each will be able to open each other's files.
 2015-08-10 06:24:40 -07:00
Eric House
87e3108296 cleanup: make work based on location if target not specified 2015-08-10 06:23:24 -07:00
Sylvie
bdf44dfdb2 Translated using Weblate (Dutch) 
Currently translated at 100.0% (683 of 683 strings)
 2015-08-10 11:40:09 +02: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