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
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
77c92ac4f3
improve a couple of plurals elements
2015-09-30 06:54:33 -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
e9059cba47
provide default rematch game name that makes sense on both devices
2015-09-24 20:26:43 -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
a2fb6045a8
tweak move reminder strings
2015-09-22 20:21:58 -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
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
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
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
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
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
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
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
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
