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

4945 commits

Author SHA1 Message Date
Eric House
18503f2237 If we get an intent and can't open the game it names, that's probably because GamesListActivity has been relauched on top of itself. So exit with a (temporary) Toast message. 2016-04-20 21:50:09 -07:00
Eric House
c9a1f00a43 catch up with non-dbg changes, esp. enabling dual-pane mode (though 
it's off now thanks to a compile-time constant)
 2016-04-18 06:21:49 -07:00
Eric House
406eb77f54 post notification (rather than just play sound) when turn comes into 
boarddelegate but it's not visible
 2016-04-14 22:16:18 -07:00
Eric House
c860773234 still learning magit: check preference before playing sound 2016-04-14 21:50:18 -07:00
Eric House
99effcac89 looks like I missed a hunk in previous commit 2016-04-14 21:42:22 -07:00
Eric House
e239430260 play notification sound when a move or chat is added to the board or 
chat view. Still TODO: post a notification when that view isn't visible.
 2016-04-14 21:39:23 -07:00
Eric House
994672667c gitignore some stuff 2016-04-14 21:07:12 -07:00
Eric House
33225f3bc5 refactor message receiving/distributing code into superclass. 2016-04-11 06:01:25 -07:00
Eric House
a0ae117e35 fix invitations breakage introduced when JNIThread because self-initing. 2016-04-09 14:47:48 -07:00
Eric House
27b3004b43 exclude computers from BT paried devices scan -- since doesn't work on 
ubuntu right now.
 2016-04-09 13:57:16 -07:00
Eric House
baee084a90 add assert to catch case where exception may otherwise be thrown 2016-04-09 13:34:13 -07:00
Eric House
57dcbabab6 use a constant 2016-04-09 13:10:04 -07:00
Eric House
04a697b260 fix NPE: put back setReceiver() call lost when JNIThread became 
self-initing.
 2016-04-09 12:42:47 -07:00
Eric House
3dd69d90d9 This stuff has to be done before content gets added. Move into 
Activity for now, though this may not work in dual-pane mode.
 2016-04-09 12:23:26 -07:00
Eric House
f876c49cd6 don't require that ant be run before install 2016-04-09 11:51:48 -07:00
Eric House
1c6e97e164 AS-generated changes adapting to the 2.0 release 2016-04-07 12:34:58 -07:00
Eric House
589535cdbc Make JNIThread responsible for opening/owning game and other objects 
whose lifespan matches its, e.g. the gameptr and gi. This is a big
change, and there are still some bugs/crashes, but it's worth
committing this snapshot.
 2016-04-07 12:23:13 -07:00
Eric House
160d69640a log refcount changes 2016-04-07 09:48:23 -07:00
Eric House
b2c4bd9e23 better chat text hint 2016-04-07 09:30:29 -07:00
Eric House
14bdde7ff0 save game whenever refcount is released. Works around BoardDelegate 
reloading the game every time it resumes. Better fix would be to have
JNIThread() own loading the game and only do so when first created.
 2016-04-07 09:27:00 -07:00
Eric House
d541c976bf add PENDING comment 2016-04-07 09:23:07 -07:00
Eric House
9f05d45e05 sometimes when return from background ChatDelegate is the first to try 
to reference JNIThread. Until I can make that work, just finish() --
to avoid crashes.
 2016-04-07 09:22:41 -07:00
Eric House
049c25f16d save when exiting to prevent data loss opening chat window. 2016-04-06 21:41:48 -07:00
Eric House
a55e17cd41 cleanup; log rowid in release() and retain() 2016-04-06 21:40:46 -07:00
Eric House
a90ec29ff0 fix delete game problem: delete first using lock we already have. 2016-04-06 18:42:37 -07:00
Eric House
3a368a8efd toward working better in background: log and print stack when doing 
nothing because jnithread is null. Pass incoming chat messages to
ChatDelegate if it's up, and otherwise launch it as before.
 2016-04-06 11:16:51 -07:00
Eric House
919e44f21e first cut at accepting input when running. Won't work when whole app is in background. 2016-04-06 11:08:27 -07:00
Eric House
347ff60434 toward working in background: log when called on null thread rather than crashing 2016-04-06 11:07:30 -07:00
Eric House
70c0db6504 chat: add hint string, and make textfield full width 2016-04-06 11:06:10 -07:00
Eric House
4bb16e88ef better logging 2016-04-06 11:03:18 -07:00
Eric House
7b045fb413 add constant to disable dualpane on debug builds too 2016-04-06 11:03:02 -07:00
Eric House
f6cbe2ec61 Toward launching fragment for result. Fires an assert on returning 
since that's not done yet.
 2016-04-05 09:37:17 -07:00
Eric House
b68775b620 oops -- fix compilation error 2016-04-05 09:17:03 -07:00
Eric House
b3f6e1b0a3 Make config work as a fragment, and clean up all the fragment 
subclasses: only one method needs to be overridden.
 2016-04-05 08:56:33 -07:00
Eric House
8cb2cecc18 add logging toward catching board layout problems; throw exception 
when can't unlock game (possible fix to multiple instances of
GamesListActivity stacking up); cleanup of GamesListDelegate tracking
of open games.
 2016-04-05 08:18:12 -07:00
Eric House
21ef6d4e13 tossing stuff at the wall trying to fix occasional failures to layout 
board in dual-pane mode (that show up as all-white BoardView). I think
there was a slight reduction in frequency, which varies with screen
size at least.
 2016-04-04 14:30:04 -07:00
Eric House
ae8a66f37b snapshot on the way to handling rotation of the board view. Pass 
orientation changes down to it (or any other interested delegate), and
have it lay its container out again. There appear to be race
conditions here: sometimes the toolbar winds up in the wrong
orientation, and on some devices the board can be blank. One problem
is that on a multi-paned device a single pane may be portrait (taller
than wide) though the whole device is in landscape mode. The big
challege is to get the view's max dimensions (and whether it's
landscape or portrait) when layout hasn't yet begun, because we that
for the jni part of layout. Messy still, but better than before and I
think progress in the right direction.
 2016-04-04 13:43:16 -07:00
Eric House
b6431f0373 when normal means don't succeed in generating summary, try again with 
via JNIThread's cache.
 2016-04-04 11:35:39 -07:00
Eric House
f47a11aa42 snapshot of changes adding refcounting to jnithread so and instance 
can be shared by multiple delegates, e.g. Board and Chat. Works but
with lots of crashes and stuff remaining to be done.
 2016-03-31 22:05:58 -07:00
Bernard Massot
1aba000f89 Translated using Weblate (French) 
Currently translated at 99.4% (721 of 725 strings)
 2016-03-31 00:44:28 +02:00
Bernard Massot
e8cf76be72 Translated using Weblate (French) 
Currently translated at 99.4% (721 of 725 strings)

this string should be split into a singular and a plural versions
 2016-03-28 21:46:12 +02:00
Bernard Massot
978f15d1c9 Translated using Weblate (French) 
Currently translated at 99.4% (721 of 725 strings)
 2016-03-28 21:45:59 +02:00
Bernard Massot
4ca62547fc Translated using Weblate (French) 
Currently translated at 99.4% (721 of 725 strings)

this string should be split into a singular and a plural versions
 2016-03-28 21:00:24 +02:00
Bernard Massot
fb66c6ecbc Translated using Weblate (French) 
Currently translated at 97.2% (705 of 725 strings)
 2016-03-28 20:38:41 +02:00
Eric House
b6f992533a fix NPE. Method isn't called unless positive/confirming button has 
been pressed.
 2016-03-19 05:44:37 -07:00
Eric House
ab26e263ef cleanup: remove unnecessary file. 2016-03-14 22:01:55 -07:00
Eric House
0bc6387714 add support for behavior: when the left fragment opens a new fragment 
it replaces the right one rather than pushing the left off the
screen. Use that to make dictionary browser, chat, and studylist all
able to swap places while the open board is on the left.
 2016-03-14 21:48:07 -07:00
Eric House
f23a28cbce log onDestroy too 2016-03-14 21:46:28 -07:00
Eric House
0a843bd430 add chat fragment, which displays ok but can't send. Turn menus off/on 
as fragments are made visible.
 2016-03-13 19:53:59 -07:00
Eric House
c35020ef97 Merge branch 'android_branch' into android_dualpane2 
Conflicts:
	xwords4/android/XWords4/archive/R.java
 2016-03-13 17:27:02 -07:00
Eric House
61ff6a6c33 Merge branch 'android_beta_106_branch' into android_branch 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
 2016-03-13 17:16:47 -07:00
Eric House
a8ebaaf789 better summary text 2016-03-13 14:42:50 -07:00
Eric House
1bcd977fa0 oops: fix crash by passing the right table name 2016-03-13 14:42:37 -07:00
Eric House
365695423c add a bunch of logging to code converting old-format chat. I've seen 
this code fail once, can't reproduce even on the same data, so I want
this in place (debug builds only) in case it happens again.
 2016-03-13 13:55:46 -07:00
Eric House
d25d33689a put a colon after chat sender's name in display 2016-03-13 12:50:09 -07:00
Eric House
b07a783fe1 revert to sdk 19 for gradle builds too (though they're just for 
debugging at this point)
 2016-03-13 12:42:31 -07:00
Eric House
0338bedf38 revert change adding new notification icon. It's not required when 
building for SDK 19, and I don't want to release it without testing on
more OS versions.
 2016-03-12 17:40:20 -08:00
Eric House
a157c9bb43 up strings and changelog for release 2016-03-12 17:39:18 -08:00
Eric House
d208e4ef51 ignore more AS metadata 2016-03-12 17:38:25 -08:00
Eric House
78f0ac7783 delete a game's entries in chats table when it's deleted 2016-03-12 17:23:25 -08:00
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
a111cf8953 move static stuff from activity to delegate 2016-03-12 15:46:59 -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
aa4f4e0e99 launch the Main activity after installing 2016-03-12 14:28:40 -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
5d9de30170 merge remote changes 2016-03-08 07:27:30 -08:00
Eric House
a03dd9423d move dbg build back to target-19 too 2016-03-08 07:20:52 -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
d67d9a704c script to make it easier to launch logcat with multiple devices connected 2016-03-06 06:34:25 -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
ff12cc6f91 tweak scripts to have better default behavior 2016-03-05 12:16:23 -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
ca41a2390c usage should exit with an error 2016-02-24 22:16:56 -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
dd0a677d97 upgrade to latest crittercism (java code only) 2016-02-24 07:23:50 -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
19d1a6059e new script for working with gradle builds. Probably totally broken: 
I'm committing it now because I'm tired of it being in the way during
branch changes.
 2016-02-19 07:12:00 -08:00