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

4418 commits

Author SHA1 Message Date
Eric House
9e9d9a740c add and use fragment for dict browser. Works except for the relaunch 
logic around changing the parameters (e.g. word length filters.)
 2016-03-12 16:46:44 -08:00
Eric House
117752d965 move static stuff from activity to delegate 2016-03-12 15:47:34 -08:00
Eric House
8981765897 fix finish() so it pops stack in fragment case 2016-03-12 15:32:53 -08:00
Eric House
31d01e4ef0 remove dead file 2016-03-12 15:32:32 -08:00
Eric House
5928c8a9e6 handle dialogs correctly in Fragment activity, at least to the extent 
of fixing the new game name one.
 2016-03-12 15:17:19 -08:00
Eric House
e72443b850 go straight to single-pane implementation for non-debug builds. If this works 
might be able to fold this branch into what I'm releasing from.
 2016-03-12 15:14:06 -08:00
Eric House
04144213d5 fix so at least games list and board work. Required finishing the list view implementation. 2016-03-12 14:29:16 -08:00
Eric House
9837fc61bf fix gradle build: compile support library 2016-03-12 14:23:38 -08:00
Eric House
29992a5d8b changes the initial post-merge commit didn't pick up. Still no idea if it runs. 2016-03-11 22:21:07 -08:00
Eric House
b7694b67d2 Merge branch 'android_branch' into android_dualpane2. Compiles after a ton of conflict resolution and some file removal. No idea if it runs, but little confidence. 
Conflicts:
	xwords4/android/XWords4/.gitignore
	xwords4/android/XWords4/archive/R.java
	xwords4/android/XWords4/res/values/strings.xml
	xwords4/android/XWords4/res/values/styles.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/BTInviteDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DelegateBase.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/Delegator.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/DwnldDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/InviteDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/ListDelegateBase.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/MultiService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayGameDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSInviteDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/StudyListDelegate.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/XWListActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocItemEditDelegate.java
	xwords4/android/scripts/adb-install.sh
	xwords4/android/scripts/find-and-ant.sh
 2016-03-11 22:19:37 -08:00
Eric House
08da6e5472 use logdf instead 2016-03-11 18:23:59 -08:00
Eric House
e0cf48779d delete a game's entries in chats table when it's deleted 2016-03-11 18:21:25 -08:00
Eric House
054cf5bf52 drop mysterious exception that seems to happen only on one emulator 
and that can be safely dropped then.
 2016-03-11 18:20:53 -08:00
Eric House
7f4729ad73 send messages from within chat delegate, without closing it. Requires 
leaving the board delegate's game and jnithread open and adding a
static to JNIThread to chat can get the current instance to use for
sending, all a bit of a hack that depends on onDestroy getting called
in a timely manner. TODO: display chats that arrive while the
receiving game's window is open.
 2016-03-10 07:38:55 -08:00
Eric House
78fb130e4f stack-overflow config wierdness to fix long chat lines not 
wrapping. Needs testing on multiple OS versions.
 2016-03-08 07:20:40 -08:00
Eric House
5dc7b66e89 use different background color for local player's chat lines 2016-03-08 07:20:02 -08:00
Eric House
cd93bdb03e move to sdk-22 breaks jni on x86, so revert to -19 for now. 2016-03-06 09:59:22 -08:00
Eric House
0b7dca2222 store and present chat sender's name instead of the lame "Me"/"Not me" 
thing. Requires a new table, and includes code to convert from old
format. Still need to clean up the presentation (TableRow).
 2016-03-06 07:03:54 -08:00
Eric House
f5bc9ca434 toward using chat senders' names in history: add chats table so we can 
keep track of sender as a separate column rather than a prepended
string. I'm committing this separately for easier debugging of the
code that uses it and that converts from the old format.
 2016-03-05 21:30:21 -08:00
Eric House
d536d05e24 remove unnecessary override (identical to parent's implemenation) 2016-03-04 19:49:59 -08:00
Eric House
4f3d620cd6 in search of why some game summaries never load: show a different 
state string when the load has timed out.
 2016-03-04 08:34:47 -08:00
Eric House
885b375a55 add a notification icon that looks better on lollipop. But: still needs polish. 2016-03-04 08:29:31 -08:00
Eric House
0f6615b25b formatting 2016-03-04 08:16:42 -08:00
Eric House
36bce5332d undo changes forcing there to be a single checked item, since that 
made it impossible to do bulk deletes.
 2016-02-29 07:38:08 -08:00
Eric House
eb4613c842 deal with case where invitation via relay requires a wordlist that 
must be downloaded. (Does not solve the problem that if the download
fails the invitation must be resent.)
 2016-02-26 07:13:12 -08:00
Eric House
830d66e538 ignore AS metadata 2016-02-25 21:37:15 -08:00
Eric House
03dc1206a5 remove Android Studio metadata. 2016-02-25 21:34:00 -08:00
Eric House
b8c98487d7 use sdk 22 for gradle builds too; rename apk file based on git revision number 2016-02-25 21:20:17 -08:00
Eric House
6fe302eab1 first cut at fix to hundreds of games leading to attention-grabbing 
battery usage: rather than have every single ExpiringDelegate set its
own timer, run a single time they can attach themselves to.
 2016-02-24 22:16:40 -08:00
Eric House
8c3f1ee100 up sdk version to 22 in order to drop timestamp from marshmallow logs 
(since they provide it natively)
 2016-02-24 07:12:10 -08:00
Eric House
3a94f38820 use android-19 instead of -14, which seems to be no longer supported 2016-02-21 13:36:57 -08:00
Eric House
bf3c0021a6 up version and changelog for new release 2016-02-19 07:10:28 -08:00
Eric House
33916761fb include various options, e.g. whether hints are allowed, in data used 
to clone a game prior to a rematch so they're not lost. Thanks A.B.!
 2016-02-18 06:48:48 -08:00
Eric House
ee0caad464 make String private 2016-02-18 06:39:40 -08:00
Eric House
ac9ab226a4 Merge remote-tracking branch 'weblate/android_translate' into android_branch 2016-02-09 07:15:57 -08:00
naofum
ccdf1d6bf9 Translated using Weblate (Japanese) 
Currently translated at 100.0% (725 of 725 strings)
 2016-02-05 12:57:57 +01:00
Eric House
bec115568e remove FIXED -- was a one-time thing 2016-02-04 20:45:17 -08:00
Eric House
856bb89749 drop french, since there are better dictionaries; don't say FIXED for 
languages that didn't have the thing before
 2016-02-03 20:53:58 -08:00
Eric House
0684139183 add ability to build a second variant. Works, but they can't both be 
installed because of duplicate permissions.
 2016-02-03 20:44:40 -08:00
Eric House
2cb989022c up name and version code for new release 2016-02-03 20:40:46 -08:00
Eric House
ee5c0707f0 generated files 2016-02-03 20:40:12 -08:00
Eric House
37bf8179aa add to list of languages thefreedictionary.com supports (and put tmp 
FIXED! in its name for people who got used to it being broken)
 2016-02-03 20:39:48 -08:00
Eric House
c4eaf912d6 better string 2016-02-03 20:39:07 -08:00
Eric House
f49925bcb4 fix thefreedictionary lookups, at least for English 2016-02-03 06:16:31 -08:00
Eric House
874b479a69 avoid NPE by dropping message after test 2016-02-02 20:54:35 -08:00
Eric House
5ccb9bf7a3 notes and version code changes for release 2016-02-02 19:41:16 -08:00
Eric House
6e30d77ada pull int (ptr) out of GamePtr inside jni code where it can be done 
once instead of at every call site. There's probably a performance
penalty to making bunch of extra calls back into java, but the code's
much cleaner. Will pay attention to performance changes.
 2016-02-02 07:50:02 -08:00
Eric House
5ddb4da466 when resending messages, be willing to do it more frequently, and 
don't count toward quota unless a send actually happens.
 2016-02-02 07:32:41 -08:00
Eric House
d3e521ca6e cleanup 2016-02-02 07:04:29 -08:00
Eric House
19713a40ad add param to comms_resendAll to limit type of message sent 
(e.g. BT). Meant to be used when a single type has become available.
 2016-02-02 07:01:48 -08:00