Commit graph

1625 commits

Author SHA1 Message Date
Eric House
f1123bebfc played word lookup: skip choosing if only one choice 2021-04-26 08:16:24 -07:00
Eric House
daf5894d79 call new web api to ack mqtt messages
This is toward debugging. Not sure it'll be use to add functionality yet.
2021-04-19 07:04:58 -07:00
Eric House
356280565a ensure default addr type set never empty 2021-04-08 21:43:24 -07:00
Eric House
b9c34b2b31 don't include relay in rematch addressing 2021-04-01 13:26:25 -07:00
Eric House
a1cabd6c4c don't add relay to new games -- mqtt only 2021-04-01 10:10:08 -07:00
Eric House
2d3f86a396 Merge branch 'from_android_beta_175' into android_branch 2021-03-31 16:59:31 -07:00
Eric House
ad3fd9342c up strings for bug-fix release 2021-03-31 16:37:12 -07:00
Eric House
229ced9a29 add and use new string for networked case 2021-03-31 16:33:53 -07:00
Eric House
0e3cd7c9f5 upgrade to latest stable (LTS) NDK 2021-03-31 16:21:03 -07:00
Eric House
29261dd370 fix crash when no radio's been chosen 2021-03-31 16:19:19 -07:00
Eric House
60d6cf444a fix crash when no radio's been chosen 2021-03-31 16:18:44 -07:00
Eric House
97962fceed upgrade to latest stable (LTS) NDK 2021-03-29 18:26:05 -07:00
Eric House
f13e81a4b5 Merge branch 'android_branch' into wasm 2021-03-28 18:39:07 -07:00
Eric House
9cf07b6327 remove unused json field 2021-03-28 10:28:47 -07:00
Eric House
64ff2e5f69 Merge branch 'android_branch' into wasm 2021-03-27 10:27:14 -07:00
Eric House
61d580adeb remove extra line-feeds 2021-03-26 22:19:00 -07:00
Eric House
f441ec18b3 changelog and version change for upgrade 2021-03-25 20:25:54 -07:00
Eric House
0e7edd9dcf fix build breakage by reusing rather than duplicating string 2021-03-25 15:45:53 -07:00
Eric House
430750e23a Change text for blank-out-filter-config Clear, not Reset
Reset somehow makes me expect the filter to be re-applied after the
inputs are removed.
2021-03-25 12:10:49 -07:00
Eric House
59acc5d619 disable reset button unless there's state to clear
Using a timer seemed easier than adding listeners on a bunch of fields.
2021-03-25 09:41:43 -07:00
Eric House
a11db395d5 fix invite alert not being dismissed on game connect
At least where QR was being used, it didn't go away. Not sure why, but a
global was getting nulled when it shouldn't have been. Race condition I
guess.
2021-03-22 12:22:53 -07:00
Eric House
561c5c9eb1 cleanup 2021-03-22 10:43:34 -07:00
Eric House
bdb081d0e3 cleanup: remove version test and tweak strings
There's no point in checking if I'm running on a version the Play Store
hasn't supported for years.
2021-03-21 17:29:08 -07:00
Eric House
3102271840 turn "known players" on for all 2021-03-21 13:40:17 -07:00
Eric House
4f8ae02bbe regression: don't offer to archive archived game 2021-03-21 13:25:47 -07:00
Eric House
1869557f12 when a move is dropped for lack of dict, alert user
Better to encourage deletion so the remote player knows what's up. This
will not happen often but it has bitten me so....
2021-03-21 10:33:49 -07:00
Eric House
637c47e506 add another as-generated vector asset
Can't figure out how to change the color on the untrade one, so it'll
wait.
2021-03-20 20:05:13 -07:00
Eric House
21b4f51648 swap menuitem positions 2021-03-20 13:46:02 -07:00
Eric House
677abe6fb8 remember prev dict choice and use for longtap
Often I want to view a different wordlist from what's in use in the
game. So make the in-board long-tap shortcut to a wordlist remember what
the short-tap gesture chose most recently and use that instead of
assuming the game's list is what's wanted. Remember the choice on a
per-language rather than per-game basis.
2021-03-20 13:29:22 -07:00
Eric House
e1712f4560 when KP is deleted, remove record of its being expanded
I'm tired of having a record recreated and showing up expanded first
thing. Better to save less garbage.
2021-03-20 08:49:41 -07:00
Eric House
88e76af7ab put scores alert on backstack too
It also should go away when board is dismissed.
2021-03-19 18:14:00 -07:00
Eric House
521a5b57b8 put gameover alert on backstack
This seems to do what I want: cause it to be dismissed whenever the
board fragment behind it (that launched it) goes away, e.g. because the
remote deleted first and local got a deleted-elsewhere-so-delete-here?
alert.
2021-03-19 18:04:52 -07:00
Eric House
17311dc757 get rid of dict processing where possible
The old API required passing dict into game creation/loading. New
doesn't, but in some places I was doing other stuff there (like checking
existance), so can't remove there. Still code goes away.
2021-03-19 14:29:20 -07:00
Eric House
970c2f6f9a make android compile/run with wasm changes 2021-03-19 14:29:20 -07:00
Eric House
34aee3d7d0 add remaining langs to code-to-lang table 2021-03-19 14:29:20 -07:00
Eric House
073b5f6bf3 enable delete and archive when msg queue empties
Recent change added Delete button to game-over alert, but only when no
unacked messages remained (since deleted games can't continue trying to
send messages other games might still need to know the game's over.)
Typically the alert would go up and then, if the remote device is
online, shortly after acks would arrive. Now when that happens the alert
gets updated to offer to delete and archive.
2021-03-19 14:07:43 -07:00
Eric House
e30a02ee7c cleanup: more getting rid of Dialog 2021-02-25 17:20:15 -08:00
Eric House
d0323b5ce1 move game name field to top of dialog 2021-02-25 17:18:52 -08:00
Eric House
f7ba081e01 don't offer to archive or delete games missing acks
Once in the archive games don't ever send unless opened explicitly (no
resend-all-on-gained-network stuff for them). So don't offer to put a
game there if it has unsent (unacked) messages. Should prevent problem
of a host being archived before it's managed to send its final move to
all guests.
2021-02-25 12:13:23 -08:00
Eric House
c22526b1f7 Offer to delete finished games 2021-02-25 10:14:06 -08:00
Eric House
9804594237 cleanup: use AlertDialog not Dialog 2021-02-25 08:56:08 -08:00
Eric House
5c09d9b9a4 add commented-out javac option
(so I don't have to research it again)
2021-02-25 08:55:05 -08:00
Eric House
ad8451d5c9 fix NPE
When nothing has focus can't close keyboard. (Likely it's not up in that
case anyway.)
2021-02-24 21:18:59 -08:00
Eric House
1c9b94efbc hide keyboard when filter run and when filter closed 2021-02-24 20:15:58 -08:00
Eric House
5736870357 when filtering, enter key hides keyboard and applies filter 2021-02-24 20:08:43 -08:00
Eric House
e2b51beb60 for filters, bring up keyboard all-caps 2021-02-24 20:03:39 -08:00
Eric House
9af5ed2a6c add reset button to wordlist filter 2021-02-24 19:10:31 -08:00
Eric House
c97b9875bd cleanup: make TableLayout include less
Scroller is allowed only one child and I guess I wanted the TableLayout
to suffice, but having unrelated stuff in it sucked. So wrap it in a
LinearLayout and move the unrelated stuff out.
2021-02-24 19:03:52 -08:00
Eric House
ae0a30a088 french translation for f-droid metadata
We'll see if it shows up.
2021-02-23 17:09:09 -08:00
Eric House
e351a5e4f0 up release numbers; changelog changes 2021-02-22 08:12:48 -08:00
Eric House
5abc95dd6e add experimental translatable f-droid metadata 2021-02-21 16:21:02 -08:00
Eric House
28e0dfe315 give prefs entry-page a title 2021-02-21 11:52:37 -08:00
Eric House
aaca73eb40 bring up different dialog after invite sent 2021-02-21 10:40:53 -08:00
Eric House
4e21e40de5 tweak buttons and text of invite dialog
I want to encourage people not to think there's action to be taken
between when they invite and an invitee responds, e.g. to email. So make
the "Close Game" button the "positive" one that case.
2021-02-20 20:33:35 -08:00
Eric House
014cafe67e cleanup 2021-02-18 16:53:00 -08:00
Eric House
309fcece03 generate mapping from prefs file to binding to fix reset
I balked at writing code consisting of a bunch of classes there only to
provide a mapping to resource file IDs, instead opting to generate them.
(The right move might have been to generate everything from the old
xwprefs.xml, but it's too late for that. :-)
2021-02-18 15:57:10 -08:00
Eric House
fdb9b43c63 regenerate new prefs xml files from previous scheme
I realized I'd made some mistakes and so rebuilt them from the old
xwprefs.xml file. Didn't find any new mistakes, but there are fewer
unnecessary changes so the release-to-release diff should make more
sense.
2021-02-18 09:57:59 -08:00
Eric House
a13e33688a add missing prefs 2021-02-17 20:21:58 -08:00
Eric House
6c50fcb818 cleanup; make original tiles-values choice the default
We've decided that on upgrade users shouldn't be surprised by a busy
board and unaware of how to fix it. So keep it the way it's been and let
the curious discover the new ability. Also, simplify code.
2021-02-17 15:47:55 -08:00
Eric House
2ebb8caaf9 don't over-scroll
At least with my dozens of Known Players I was getting an empty alert.
2021-02-17 10:34:15 -08:00
Eric House
04bc1d20a3 use radio buttons for menu to show cur setting 2021-02-11 14:42:57 -08:00
Eric House
be0a6f83f3 drive letters/values from a three-value enum
There are three choices now. The button pops up a menu on android and
moves through the choices on linux.
2021-02-11 14:11:02 -08:00
Eric House
64f1d83b5d show-values mode now means show along with face
not instead of. It now feels as if it should be a global setting, not a
per-game thing to toggle. We'll see what folks think.
2021-02-10 20:43:11 -08:00
Eric House
232cbe04ef tweak strings 2021-02-10 17:19:47 -08:00
Eric House
da352d6948 draw tile value in cell
This is an experiment. I suspect the eventual fix will be to have two
modes, one of which draws the values and the other doesn't, replacing
the TILES/VALUES pref.
2021-02-10 17:05:55 -08:00
Eric House
538ab5ab3b Rename a couple of variants to be more clear 2021-01-29 18:05:33 -08:00
Eric House
d5c706fb07 trying to not have all travis builds show "dirty" 2021-01-29 16:28:52 -08:00
Eric House
4fef4e4b29 Move to using androidx-based prefs classes and recipes
Use the current recommended classes and organization of app
settings. Means breaking xwprefs.xml into eight or so files and a bunch
of changes to classes derived from Preference. Seems to work, but there
will be bugs. Also got rid of most Activity subclasses that were
alternatives to Fragments, since all Android versions I'm allowed to
support now support Fragments.
2021-01-29 16:05:38 -08:00
Eric House
31cfbaab1a up changelog for new release 2021-01-28 19:02:00 -08:00
Eric House
457955c40e move QR-Code to top of local invite-means list
It'll be the most often used I suspect so make it easier to find.
2021-01-28 16:22:44 -08:00
Eric House
8dd1db31c7 don't include FCM service in shared Manifest
Since not everybody has it now, and you crash if you try to load what
you don't have.
2021-01-28 16:22:44 -08:00
Eric House
0373f02c3e tweak color edit dialog 2021-01-27 11:58:56 -08:00
Eric House
4850b77756 UI and string tweaks 2021-01-25 21:58:36 -08:00
Eric House
0698e67dcf tweak string 2021-01-25 20:21:50 -08:00
Eric House
73f9b20df7 Squashed commit of the following:
commit d255dc7758
Author: Allan Nordhøy <epost@anotheragency.no>
Date:   Sun Jan 17 18:26:54 2021 +0000

    Translated using Weblate (Norwegian Bokmål)

    Currently translated at 69.3% (619 of 892 strings)

commit 542af0a287
Author: Allan Nordhøy <epost@anotheragency.no>
Date:   Sun Jan 17 18:27:24 2021 +0000

    Translated using Weblate (English)

    Currently translated at 100.0% (892 of 892 strings)

commit 8ced0990d0
Author: Luca De Filippo <luca.defilippo@translationcommons.org>
Date:   Thu Jan 14 15:41:05 2021 +0000

    Translated using Weblate (Italian)

    Currently translated at 96.3% (859 of 892 strings)
2021-01-19 20:35:10 -08:00
Eric House
178042159b remove debug-only warnings about relay stall
Yeah it stalls. That's why MQTT and why BT doesn't use Service any more.
2021-01-19 20:25:18 -08:00
Eric House
ddd5f7b978 remember last-used radio and start with it next time
Saves a step if you generally create games the same way most of the
time. Required reordering alert init.
2021-01-19 13:40:08 -08:00
Eric House
fafbac7a4e catch rare NPE
I got this crash once. This hack avoids it at no cost until I can track
it down.
2021-01-19 10:05:49 -08:00
Eric House
fb8d86c5da tweak text 2021-01-19 10:05:42 -08:00
Eric House
19542fee88 send sdk INT when registering
better for tracking than version string
2021-01-18 08:45:57 -08:00
Eric House
66456725ef revert Paho upgrade (crashes on boot on 4.1.1) 2021-01-18 08:44:47 -08:00
Eric House
5080889f68 toward a debug build that's closer to f-droids
since that's where the majority of downloads are coming from, let's make
sure play using SMS works and than MQTT is fine without FCM.
2021-01-16 18:00:04 -08:00
Eric House
4f6c13a0d2 upgrade paho client
One I'm using crashes occasionally so see if it's fixed. Not that I'm
checking changelogs or anything :-)
2021-01-11 14:09:57 -08:00
Eric House
7af001d481 game config changes
get rid of password; disable, not hide, stuff that's irrelevant for a
non-local player
2021-01-09 20:39:33 -08:00
Eric House
91d306270d remember which KnownPlayer entries are expanded 2021-01-05 12:21:54 -08:00
Eric House
4aaee07369 add button taking you to Known Players browser
from the new-game alert. It winds up closing that alert without creating
a game, but that's ok for now IMO.
2021-01-05 11:47:21 -08:00
Eric House
3350ca19b7 use same (new) dialog for solo games 2021-01-04 21:26:12 -08:00
Eric House
65ba8cef66 use same dialog for all new networked games 2021-01-04 11:46:34 -08:00
Eric House
185abd2d04 up copyright date: Happy New Year 2021-01-04 08:23:51 -08:00
Eric House
64a470185c display known player timestamp when known (debug only)
For some reason it's getting cleared sometimes. Will fix.
2021-01-04 08:12:05 -08:00
Eric House
a3048441e9 fix the unable-to-post-alert alert
Returning null from createDialog() isn't allowed, so return this as a
fallback as before. But the old code immediately dismissed it and
created another in an infinite loop. So just suck it up and display it.
And as always hope users don't see it.
2021-01-03 17:43:28 -08:00
Eric House
bf6afb803f remove obsolete BuildConfig variable 2021-01-03 17:01:52 -08:00
Eric House
0ef43fe30a tweak alert layout 2021-01-03 14:15:57 -08:00
Eric House
f202ca107c make radio text larger 2021-01-03 12:26:14 -08:00
Eric House
4e49faac1f let background fragment post dialog
Fix -- I think -- problem where game-deleted message received but not
handled by ChatDelegate would loop forever. Fix is to let non-visible
fragments take a shot, the BoardDelegate in this case. Seems to work,
but wasn't 100% reproducible AND the fix may break something else.
2021-01-02 20:24:15 -08:00
Eric House
13c1c8c940 cleanup bits of game config dialog 2021-01-02 17:51:40 -08:00
Eric House
72f2db4f57 improve new-games dialog
Add radio buttons to make clear what the choices are. This should
eventually replace the alert that's show when you don't have any Known
Players.
2021-01-02 17:02:08 -08:00
Eric House
07c4deb185 don't show wordlist note line unless present 2021-01-01 16:48:06 -08:00
Eric House
8a6244bd9f cleanup: make config setting like all the others 2020-12-30 19:31:40 -08:00
Eric House
2df966b0cd tweak string and logging 2020-12-29 15:50:23 -08:00
Eric House
1a5d967054 up versions codes 2020-12-28 14:58:33 -08:00
Eric House
0c939984f5 choose the shortest pattern
Don't assume it's the last as previous code did
2020-12-28 14:58:33 -08:00
Eric House
d72142ad40 cleanup 2020-12-28 14:58:33 -08:00
Eric House
dc4fcada2a show wordlist's md5sum (non-release builds only) 2020-12-21 17:22:17 -08:00
Eric House
9929feecdc use the last pattern when several available
For some reason, in Spanish but not Catalan, filtering doesn't work with
two-letter tiles. The reason is that e.g. with RR two patterns, R.R and
RR (i.e. two R tiles, or one RR tile), are returned. The first shouldn't
be there since there are no words with RR that are spelled with two R
tiles. Until I can fix this picking the second (last) pattern seems to
work better.
2020-12-20 21:19:51 -08:00
Eric House
15c5f18e7e update changelog 2020-12-19 15:12:21 -08:00
Eric House
563db2f089 send language code (since name is getting localized)
Allows server to check for wordlist upgrades correctly.
2020-12-18 20:44:16 -08:00
Eric House
2b7ffb3030 don't report NULL loc strings version 2020-12-18 08:00:32 -08:00
Eric House
4f7ab4fd46 turn on batch proto for BT
Will break apps more than maybe two years old. Sad.
2020-12-17 15:51:08 -08:00
Eric House
a175ed525f add handling of new wordlist-download uri
If I can't figure out how to register for .xwd files, next best idea is
to encode a download in a custom url. This is one way of doing that, and
works with the urls just added to BYOD. Will likely change.
2020-12-17 15:37:13 -08:00
Eric House
4b2dd9e9c5 up version strings and changelog 2020-12-14 08:57:11 -08:00
Eric House
085aad63ee offer debug menuitems on NON_RELEASE builds
not just DEBUG
2020-12-14 08:57:11 -08:00
Eric House
731a24ba0a include mqttdevid in app info sent for upgrade check 2020-12-14 08:57:11 -08:00
Eric House
2056291cd5 revert string changes (overriding translator :-)
Known Players is a feature I'm devloping and right now want to keep it
capitalized as players learn what it is. It's only in debug builds at
the moment anyway.
2020-12-14 08:57:11 -08:00
Eric House
1c5a32ac15 include relayDevID when registering with mosquitto
Will make it easier to debug stuff
2020-12-14 08:57:11 -08:00
Eric House
35db73e4e4 display BT Mac addr in About dialog (debug only)
It's useful so why not.
2020-12-14 08:57:11 -08:00
Eric House
ac25baedd1 oops 2020-12-14 08:57:11 -08:00
Eric House
17bda01d16 don't require title in FCM notification
And turn off the raised-tile thing for now
2020-12-14 08:57:11 -08:00
Eric House
17ea06067d don't use hex version of gameID
It's too hard to force the relay's webview to do the same
2020-12-14 08:57:11 -08:00
Eric House
e07993c306 show gameID in connections summary 2020-12-14 08:57:11 -08:00
Eric House
ef3de65355 Merge remote-tracking branch 'weblate/android_branch' into android_branch 2020-12-02 18:03:02 -08:00
Eric House
db430d63db changelog and version strings 2020-12-01 07:55:10 -08:00
Allan Nordhøy
fe1a34b177
Translated using Weblate (English)
Currently translated at 100.0% (883 of 883 strings)
2020-11-30 20:29:00 +01:00
Eric House
ebbb6dd7da fix NPE rotating phone when new invite-now alert up 2020-11-30 10:26:58 -08:00
Eric House
f954ae5943 turn on mqtt game-gone warnings for all 2020-11-29 11:40:17 -08:00
Eric House
7fb070da49 Squashed merge from android_translate 2020-11-28 19:16:41 -08:00
Eric House
00588f50f3 show an cannot-play-yet alert on guest side too 2020-11-28 13:55:36 -08:00
Eric House
4314a3f012 remove unused param/ivar 2020-11-28 13:55:36 -08:00
Eric House
386cfbda71 close game when invite dialog dismissed via back button
Catch the onCancelled event, and treat as "close" button tap. Also
disable cancel via taps outside the alert, which I think is less
confusing than leaving the unplayable game up without the alert or
closing it without explanation.
2020-11-28 10:33:52 -08:00
Eric House
437aef5ed5 use wrapper to replace static reference
BoardDelegate can have a one-to-one relationship to this thing, and
occasional leakage was preventing opening a new alert, so some fix was
needed. This one's simple.
2020-11-27 11:47:38 -08:00
Eric House
9929de1fa7 only show game-gone msg src on non-release builds 2020-11-25 10:40:08 -08:00
Eric House
f4e7ff1397 fix NPE for case where there are no Known Players 2020-11-25 10:39:41 -08:00
Eric House
82a11e5ebf explain where deleted game message comes from
Not sure it'll make release builds, but it's useful for figuring out if
the deletes should actually be there.
2020-11-23 21:37:18 -08:00
Eric House
48cf291c5a listen for invite alert dismiss
Because I'm doing a singleton thing, if I miss the alert going away I
won't up another up. This tries to always catch dismissal. Might still
be screwed if it's not actually put up for some reason. Needs testing.
2020-11-22 20:40:28 -08:00
Eric House
6fb3d19f03 revert having missing player count in window title
The invite-now alert is enough.
2020-11-22 20:40:28 -08:00
Eric House
776cc5703d use insecure; get own mac addr
Try using both secure and insecure sockets. The latter appears to cause
fewer problems on OS/device combos with crappy BT. It's only possible if
I know the addr of the device I want to, so hack around that being
secret by passing it on request.
2020-11-21 16:25:49 -08:00
Eric House
dbfe8083ca tweak string 2020-11-21 16:06:13 -08:00
Eric House
5031afa3ff don't include colons in nli's BT addr (to save space) 2020-11-21 16:05:21 -08:00
Eric House
f067144ec5 oops: wrong return type 2020-11-21 16:05:21 -08:00
Eric House
d5be06413f add invite history and ability to invite all at once
If inviting known players to a more-than-two-player game, can select all
at once. Required using checkboxes instead of radiobuttons for the case
where nMissing > 1.
2020-11-21 15:11:59 -08:00
Eric House
210b0bcbcb send mqtt game-gone when game deleted
Receiver only does anything if the game's open. This could change....
2020-11-21 08:43:24 -08:00
Eric House
f3bb0c99a9 invite alert changes
Create new class that owns the alert. Let it decide whether to post,
remove, etc. Seems to work, but I've removed some of the "reinvite"
options I'm not sure were helpful anyway. To be considered...
2020-11-20 18:07:19 -08:00
Eric House
105f93f3ab increase length of default room name to 5 chars
There are conflicts on relay. So while it's still relevant, reduce 'em.
2020-11-20 16:06:42 -08:00
Eric House
5d86743857 enable mqtt game-gone message for DEBUG builds
It should be enabled for all once the dup-devid problem should be behind
everybody.
2020-11-20 16:03:03 -08:00
Eric House
a58048e9eb get rid of boolean meant to prevent duplicate invite alerts
It was preventing even one and seems no longer to be necessary.
2020-11-17 17:58:22 -08:00
Eric House
cc8f1e4a57 remove bad assert 2020-11-15 10:47:13 -08:00
Eric House
e288090e70 quarantine: print the stacks holding refs when fails
Store null instead of stack for release builds to minimize performance
impact.
2020-11-14 12:08:47 -08:00
Eric House
9c913fb1c4 keep OK button disabled when no invite means selected
Little UX tweak: enable OK button based on whether there's something
available to return if it's clicked.
2020-11-14 09:20:18 -08:00
Eric House
c06b9a4835 fix tiny list item due to missing thumbnail
When thumbnail was required but couldn't be produced list item showed up
tiny as height followed thumbnail's. Instead, when there's no thumbnail
behave as if it's disabled, a layout that looks ok.
2020-11-13 17:43:30 -08:00
Eric House
3e98e91751 tweak string 2020-11-13 17:43:25 -08:00