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

1468 commits

Author SHA1 Message Date
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
d25d33689a put a colon after chat sender's name in display 2016-03-13 12:50:09 -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
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
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
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
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
bf3c0021a6 up version and changelog for new release 2016-02-19 07:10:28 -08: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
2cb989022c up name and version code for new release 2016-02-03 20:40:46 -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
5ccb9bf7a3 notes and version code changes for release 2016-02-02 19:41:16 -08:00
Eric House
9c6908d14a ignore 2016-02-01 06:55:11 -08:00
Eric House
794bce1ceb cleanup from review of diff since last release. All whitespace or 
removing logging except for one check for null.
 2016-01-27 07:31:10 -08:00
Eric House
813d5c18b3 show explanatory text when there are no invitations 2016-01-25 07:29:26 -08:00
Eric House
f07dd2a344 remove unused string 2016-01-23 22:09:40 -08:00
Eric House
e6fa514982 Merge branch 'android_branch' into android_translate 2016-01-23 22:03:40 -08:00
Eric House
b289154e19 up app version strings, changes list for new release 2016-01-21 20:56:45 -08:00
Eric House
38898776bd when re-inviting, pre-populate BT and SMS invite dialogs from the most 
recent invitation of that "means" recorded for that game
 2016-01-18 07:41:47 -08:00
Eric House
6c1394a3a5 separate explanatory dialogs for games sending invites based on 
whether they were created for a rematch. If for a rematch, don't give
user ability to change invite target; just resend (if asked) and show
a toast. Also, send rematch invites only when there aren't already
some, i.e. the first time the game's opened.
 2016-01-16 13:52:30 -08:00
Eric House
3ca47cdd82 add debug-only context menu giving conn-via config and invites for GamesList games. 2016-01-16 12:08:36 -08:00
Eric House
e8ceb82d8d add debug-only menu to show game's sent invitations 2016-01-15 20:48:53 -08:00
Eric House
fe0504a308 put a different title on notifications when it's now a player's 
turn. Probably only matters in three-device games, but I like it.
 2016-01-14 20:45:58 -08:00
Eric House
bdafcfa916 improve text around invitations 2016-01-13 19:51:24 -08:00
Eric House
e94ec48613 don't encourage invited games to invite others; instead remind that 
they've been invited and can only wait for the game to begin. (Unless
more than two devices are involved this should only happen briefly and
when connections aren't working perfectly.)
 2016-01-11 23:53:16 -08:00
Eric House
b6bebbb0c4 offer re-invite; track and display more than one invitation, 
including those whose success isn't known (email and clipboard).
 2016-01-09 10:14:43 -08:00
Eric House
73a7a8836f show in game list item if invitations pending 2016-01-09 06:58:18 -08:00
Eric House
e60945733f first step in showing a different alert for an unconnected game where 
an invitation's already been sent. It's stored in a new DB table, and
user can display info about how and to what device it was sent.
 2016-01-08 19:05:22 -08:00
Eric House
df3a213efc remove padding 2016-01-07 08:07:17 -08:00
Eric House
0fe5cce97a remove duplicate string 2016-01-07 07:39:31 -08:00
Eric House
5c14ad3f22 Merge remote-tracking branch 'origin/android_branch' into android_translate 2016-01-07 07:30:15 -08:00
Eric House
efd47d731a send the correctly calculated hash value, and up strings for another 
release.  This is the minimum required for a new release on top of the
previous one, but not enough if released on this branch!
 2016-01-03 20:23:46 -08:00
Eric House
22dde029c8 Merge tag 'android_beta_100' into android_branch 
ready for release
 2016-01-03 11:36:37 -08:00
Eric House
a51b01491d up strings for new version, and copyright for new year 2016-01-02 09:21:59 -08:00
Eric House
9ddee9790d Merge tag 'android_beta_99' into android_branch 
ready for fix-marshmallow-bt release
 2015-12-30 06:41:39 -08:00
Eric House
49caf6505a up strings and changelog for new release 2015-12-21 18:50:04 -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
6f1235492d disable local-game reminders by default 2015-10-29 07:31:21 -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
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
058be41265 change file name 2015-10-22 06:18:47 -07: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