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

8002 commits

Author SHA1 Message Date
Eric House
509dfb4b4f launch DictsActivity for result, and have it return the last language 
and wordlist downloaded. Use that information to update the spinner
that launched it so that choosing "download more" then downloading a
German wordlist causes German to be selected.
 2014-06-19 20:42:34 -07:00
Eric House
c31697ea47 tweak DictsDelegate so it works when invoked via "Download more..." 
from GameConfig spinners to add langs and dicts within a lang.
 2014-06-19 07:57:46 -07:00
Eric House
770679daa0 combine window titles since windows are also combined 2014-06-19 07:53:28 -07:00
Eric House
0c2f85d534 put back missing string for game config dialog (missed from prev commit) 2014-06-18 20:51:24 -07:00
Eric House
5568f00dd8 put back missing string for game config dialog 2014-06-18 20:51:00 -07:00
Eric House
975c37ddae add note to info alert, blank if not present 2014-06-18 20:25:45 -07:00
Eric House
927ba028fb cleanup 2014-06-18 20:24:13 -07:00
Eric House
27972d10e7 new files to ignore 2014-06-18 20:23:58 -07:00
Eric House
2c7128ad30 pull note out of dict header 2014-06-18 20:18:09 -07:00
Eric House
44e2c988ad treat nBytes as a long 2014-06-18 06:51:33 -07:00
Eric House
b6d316134d more tweaks to wordlists: display names of those that can be updated; 
click on available list shows info and offers to download; etc.
 2014-06-18 06:48:04 -07:00
Eric House
03b0b041fc Fix NPE 2014-06-18 06:48:04 -07:00
Eric House
0fe9949449 log when we don't have lang name 2014-06-18 06:48:04 -07:00
Eric House
b3852ba603 cast to int so doesn't get turned into a string on the java side 2014-06-18 06:46:45 -07:00
Eric House
3e107a82e2 include word count and file size 2014-06-18 05:18:22 -07:00
Eric House
99db1cef51 snapshot on the way to removing RemoteDicts in favor of DictsActivity 
with a "show remote" checkbox at the top.  Works, but incomplete.
 2014-06-17 06:42:07 -07:00
Eric House
2fa9b9151c remove firefox warning and unused method 2014-06-13 07:34:15 -07:00
Eric House
26a8bf418f move into superclass 2014-06-12 23:52:20 -07:00
Eric House
9cfacf6667 don't download already-installed dicts 2014-06-12 07:30:13 -07:00
Eric House
3cfd29fb2e update dict to show 'installed' after successful download 2014-06-12 07:18:32 -07:00
Eric House
f375defc0b preserve scroll position across recreation of list adapters 2014-06-12 06:51:17 -07:00
Eric House
ac2c960ef5 fix stupid listadapters, and preserve selection for remotedicts list too 2014-06-11 19:07:05 -07:00
Eric House
6de515e75e use a hashmap to track selected wordlists so selection survives 
orientation change (which typically creates new views).  TODO: apply
same trick to remotedicts display.
 2014-06-11 08:15:33 -07:00
Eric House
b3823bacb1 label dicts that are installed and that need updating 2014-06-11 07:07:14 -07:00
Eric House
42225e314e center emtpy list text 2014-06-11 06:57:51 -07:00
Eric House
281bee2e18 snapshot: mark already-installed wordlists as such. TODO: don't enable 
download menuitem when they're selected, and also compare md5 sums to
deal with anything that's installed but out-of-date.
 2014-06-10 07:25:21 -07:00
Eric House
4e4175f486 add ability to look up by language name. Note: this code is hitting 
the DB way too often and needs to be optimized!
 2014-06-10 07:08:56 -07:00
Eric House
45ebb8d3b9 put dict list info in shelf for faster response 2014-06-07 17:57:43 -07:00
Eric House
f4a098e75b add progress wheel 2014-06-07 17:52:06 -07:00
Eric House
874aa72009 get rid of handler 2014-06-07 17:52:06 -07:00
Eric House
f790b9dfda Merge remote branch 'origin/android_localize' into android_localize 2014-06-07 17:51:07 -07:00
Eric House
d54bbb3beb don't barf when something not found in git history -- just return nothing, as it's the dev case 2014-06-07 17:50:35 -07:00
Eric House
d0f901481b change prepareDialog signature to make harder to confuse with onPrepareDialog 2014-06-06 07:02:20 -07:00
Eric House
ab15037076 fix method name that prevented its getting called 2014-06-06 06:52:22 -07:00
Eric House
60dc482e76 move method into superclasses 2014-06-06 06:33:28 -07:00
Eric House
164199335a oops: this activity doesn't have a menu 2014-06-06 06:10:46 -07:00
Eric House
4ff473ed41 need to call super to avoid a crash 2014-06-06 05:56:37 -07:00
Eric House
bfe3e1303f conform with static member naming convention (no code change) 2014-06-06 05:46:05 -07:00
Eric House
93446a1760 tweak: don't redo adapter once the last download finishes 2014-06-06 05:31:08 -07:00
Eric House
c184d68976 fix NPE -- but something's still wrong with player config dict spinner 2014-06-06 05:24:41 -07:00
Eric House
202c942ab0 remove progress trackers as downloads come in 2014-06-05 07:17:55 -07:00
Eric House
b0912f3fa2 oops: needed to rename in manifest too 2014-06-05 06:19:42 -07:00
Eric House
fe7bb09d46 rename class: it's not just for wordlist any more 2014-06-05 06:10:15 -07:00
Eric House
f8612e727d Support download of multiple dicts at once. (Download of apps not tested and may be broken. Next...) 2014-06-05 06:05:23 -07:00
Eric House
08b96dac82 center empty list message 2014-06-03 07:49:20 -07:00
Eric House
f3daed2e12 add menu to remote dicts display, track selected dicts, and implement 
download. Which works. Still need to clean up UI for multiple
downloads, track selection across rebuilds of list adapter, etc.
 2014-06-03 07:45:08 -07:00
Eric House
11178845fc remove extension from dict name in download progress bar 2014-06-03 07:45:08 -07:00
Eric House
7c95c36025 cleanup imports 2014-06-03 07:45:08 -07:00
Eric House
064ef0c137 display languages in sorted order 2014-06-03 07:45:08 -07:00
Eric House
ae4260a259 snapshot: handle json data (hardcoded for now) from server and display 
collapsible list of selectable dict names.
 2014-06-03 07:45:08 -07:00
Eric House
b1705e6073 make lang group header expand button actually expand/contract. 2014-06-03 07:45:08 -07:00
Eric House
03f16a1e0b avoid NPE 2014-06-03 07:45:08 -07:00
Eric House
4596ed5d7b snapshot on the way to removing last expandablelist use: dictsdelegate 
lists languages and wordlists under them, but nothing's colapsable yet.
 2014-06-03 07:45:08 -07:00
Eric House
393d419056 cleanup: remove unused imports 2014-06-03 07:45:08 -07:00
Eric House
d55dd7e206 change format of downloadable dict info. Late checkin: Android code's 
been counting on this for several days.
 2014-06-03 07:43:47 -07:00
Eric House
a6205f3dca move onBackPressed() into activity superclasses 2014-05-29 07:15:34 -07:00
Eric House
092c0f54c8 include md5sums of dicts in json 2014-05-28 20:45:55 -07:00
Eric House
ef970efc7a don't crash: call setContentView() from delegate rather than activity 2014-05-28 20:45:14 -07:00
Eric House
5d0a6babae add function to list all wordlists by lang in a json -- toward not 
using webview for download function.
 2014-05-28 07:14:45 -07:00
Eric House
937e1fa9a9 don't upgrade app and translations at the same time (since new app may 
behave differently once installed)
 2014-05-28 06:43:37 -07:00
Eric House
9d23aef31d when a string has format specifiers, highlight them, and offer a 
newbie tip explaining the translation must match.
 2014-05-22 23:50:44 -07:00
Eric House
a6d8a74102 move a few methods, and add utilities, to superclass. 2014-05-22 23:35:51 -07:00
Eric House
4b26e04691 fix update when text cleared: passing null to setText() is ok 2014-05-22 06:46:59 -07:00
Eric House
91d7213be6 fix strings.xml files, syncing names and removing obsolete elements 2014-05-22 06:35:08 -07:00
Eric House
f87bf2f95d allow non-English strings.xml files to have duplicate text 2014-05-22 06:07:55 -07:00
Eric House
d1aa5d73f2 don't allow to save translation where format specifiers don't match; cleanup 2014-05-22 05:59:43 -07:00
Eric House
6f6781ceed move dialog creation stuff into activity base class 2014-05-21 22:03:56 -07:00
Eric House
174ee22a4b use inherited invalidateOptionsMenuIf() 2014-05-21 20:08:57 -07:00
Eric House
0b379a941b snapshot: add menu to xlation item editor. 2014-05-21 06:59:38 -07:00
Eric House
2293e6a730 remove unused imports 2014-05-21 06:56:51 -07:00
Eric House
3055a0a1e4 result of running fix_loc_xmls.py with new -% option 2014-05-20 20:54:12 -07:00
Eric House
9a9a4e2991 add option to replace %s with %1$d etc. 2014-05-20 20:53:48 -07:00
Eric House
0b6549d829 as formatted by python scripts, but without any non-whitespace changes 2014-05-20 20:52:18 -07:00
Eric House
dbaa28de5e don't refuse to delete local translation 2014-05-20 07:00:03 -07:00
Eric House
9bf92257b9 ignore more stuff 2014-05-19 07:54:08 -07:00
Eric House
af5cbe5325 need to call super when don't handle an id locally 2014-05-19 07:53:41 -07:00
Eric House
4452adf33d no blank Translate menu titles 2014-05-19 07:26:10 -07:00
Eric House
1ebf51d3ab when building from modified tree, still use latest commit number for 
about box for easier debugging. Shouldn't matter for releases.
 2014-05-19 07:15:21 -07:00
Eric House
f8dbc91cb0 don't set constant if R.java has uncommitted changes 2014-05-19 07:10:29 -07:00
Eric House
8f15f76fed label xlations with the language name 2014-05-17 16:57:24 -07:00
Eric House
018424e6e8 modify item text after the db backing it is modified by covering edit 
activity.
 2014-05-16 22:11:18 -07:00
Eric House
dfbb1bae71 derive context from menu that's triggered from it rather than trying 
to set it from onResume() calls.
 2014-05-16 22:05:48 -07:00
Eric House
3c4ed7de46 associate strings with the contexts in which they're looked up and 
implement that filter.  I'm tracking by the name of the class rather
than a WeakReference, which means that the hashsets of keys will never
be freed.  Will need to see how much memory that means I'm using.
 2014-05-16 06:40:01 -07:00
Eric House
c44a676808 derive from XWListActivity 2014-05-15 21:47:46 -07:00
Eric House
750393a5e6 oops: get the translation activity translated! 2014-05-15 06:53:03 -07:00
Eric House
891af6a84d use iter.remove to avoid ConcurrentModificationException 2014-05-15 06:43:59 -07:00
Eric House
6ce47f8208 use WeakReference rather than hashCode to associate menu with its strings 2014-05-15 06:37:03 -07:00
Eric House
5364f31da0 add filter and state-tracking for most recent menu. Used hashCode to 
identify menu (since keeping a reference to it would cause it to
leak.) Will try WeakReference instead, or just dumping when another
comes along.
 2014-05-15 05:41:15 -07:00
Eric House
e8efd70bdc tweak strings 2014-05-15 05:39:29 -07:00
Eric House
cbb10f6994 remove logging 2014-05-15 05:31:40 -07:00
Eric House
5e70d28ea1 first cut at filtering: all and modified work, but the other two 
require that I track strings by the contexts in which they appear.
 2014-05-14 21:24:29 -07:00
Eric House
6426e41d30 show locally-translated strings in red 2014-05-14 19:04:58 -07:00
Eric House
d00e49f843 save edited translations 2014-05-14 06:46:08 -07:00
Eric House
3040003126 oops -- include auto-modified files 2014-05-13 21:23:53 -07:00
Eric House
c4598f2bf9 tweak main translations strings layout 2014-05-13 21:22:50 -07:00
Eric House
4d42768f83 add separate activity/delegate for editing translations, launched by 
tapping on a line in the list-o-strings.
 2014-05-13 21:07:56 -07:00
Eric House
47eaca3d71 add filter spinner to translate dialog (though there's not yet data to filter on) 2014-05-13 06:30:38 -07:00
Eric House
049c55e2d2 toward adding default menu to all activities and eventually tracking 
translations by where they're used so most relevant can be shown: put
back common superclasses XWActivity and XWListActivity with default
implemenations of activity lifecycle methods that call through to
delegates (and that later can help LocUtils track what's been seen
when.) Not thoroughly tested, but seems to work for the main screens
anyway.
 2014-05-12 21:26:31 -07:00
Eric House
19204d5720 remove unused/commented-out file 2014-05-12 21:23:27 -07:00
Eric House
c42e5f2c0f keep elipses char where it belongs when reversing rest of strings 2014-05-11 20:15:10 -07:00
Eric House
49001c6893 various changes so dbg and bt versions build again -- and may work, but 
that's not tested yet.
 2014-05-11 19:55:05 -07:00
Eric House
2a3b8c7a74 when reversing words, preserve capitalization (i.e. start don't end with a cap) 2014-05-10 06:52:26 -07:00
Eric House
c06f0e157d first cut at file to clean up variant trees by removing anything not 
under version control
 2014-05-10 06:50:55 -07:00
Eric House
b085aeeb46 translate DialogPreference title, message and buttons 2014-05-06 21:13:10 -07:00
Eric House
30b966b902 generate fake translations automatically 2014-05-06 07:47:29 -07:00
Eric House
c0afd40337 update test section to work again 2014-05-06 07:25:00 -07:00
Eric House
806851057c update translations, late. This needs to be automated!! 2014-05-06 07:24:17 -07:00
Eric House
0ff09868cb Query user before removing build dir 2014-05-06 06:58:57 -07:00
Eric House
a4cd137cef get rid of #1 used to make strings unique: remove duplicates where 
possible, and where not replace it with a non-printing zero-width
unicode char.
 2014-05-06 06:27:33 -07:00
Eric House
d566bd63ae break the last Activities out into Delegates, and move a bunch of 
stuff info the delegate base class so fewer calls required on
m_activity and LocUtils.
 2014-05-06 05:56:43 -07:00
Eric House
5d9e846316 make constructor protected 2014-05-06 05:55:33 -07:00
Eric House
ce77f09588 the new spinner adapter override works much better for game config's 
spinners
 2014-05-05 07:38:37 -07:00
Eric House
96ca4f9946 fix NPE: not all spinners have adapters 2014-05-05 07:27:06 -07:00
Eric House
1170a31385 translate spinners by replacing their adapters with new class that 
delegates to old then translates any views returned
 2014-05-05 07:19:35 -07:00
Eric House
6165fc2201 translate list summary 2014-05-05 06:45:37 -07:00
Eric House
22a9fbdb3e translate color setting pref dialog 2014-05-05 06:37:05 -07:00
Eric House
3a7111c098 translate ListPreference lists 2014-05-05 06:03:33 -07:00
Eric House
477019757e make getopt flags match what usage says is there 2014-05-04 16:39:56 -07:00
Eric House
1fcf9027cb when looking for a translation for locale xx_YY, if there is none try 
again for just xx. And silently drop strings in the translation file
with names that don't exist in English, though eventually that
shouldn't happen.  With this change a newly installed app on a
claiming-to-be-Czech emulator picks up the Czech translation within
moments.
 2014-05-04 16:26:35 -07:00
Eric House
edcd29c88d in order that non-English versions not go long after installation 
without translations, try immediately after any install or upgrade to
get translations from server.  (Triggered from the Application rather
than an Activity, so initializing the preferences DB had to be moved
there too.) Should probably post a notification after installing
localizations, ideally with a message in the language, offering to
restart with all new strings.
 2014-05-04 15:41:02 -07:00
Eric House
6d60e45eb9 tweak fake translation generation (and include new strings) 2014-05-02 22:08:44 -07:00
Eric House
43f90cb3b0 use -1 as array index 2014-05-02 22:03:02 -07:00
Eric House
ad65b93ef2 changes necessary to actually return a translation based on revision 
hash of R.java passed by client, or none if it already has it.  Rough,
but works.
 2014-05-02 22:00:25 -07:00
Eric House
56a057f06c when translations get out of sync with R.java values, there's often a 
format exception.  Catch that, and strip out the locale's translations
so the app at least doesn't crash.  This should not happen once I have
the server side right, but it'll help now and provide a safety net
later.
 2014-05-01 22:05:57 -07:00
Eric House
8d6f46fa22 snapshot. Should work for current case where the newest R.java is older than the app connecting 2014-05-01 08:15:42 -07:00
Eric House
7b40abfa2f more features and some refactoring 2014-05-01 08:14:40 -07:00
Eric House
5a22e08664 no need for package name in app info as it's in the top-level obj 2014-04-30 07:28:42 -07:00
Eric House
164387b37d update to use mygit 2014-04-30 07:25:23 -07:00
Eric House
6d194e5362 don't chdir (which isn't cool when a cgi); use subprocess's cwd param instead 2014-04-30 07:08:59 -07:00
Eric House
d91c307792 include hash of current R.java in xlation update json, not of the entire app 2014-04-30 03:29:47 -07:00
Eric House
a3bcef18f0 add more functionality 2014-04-29 21:15:50 -07:00
Eric House
a7c4730eb5 start of a file to interact with git for getting xlations 2014-04-29 06:53:02 -07:00
Eric House
d463ea3f30 commented-out line to copy xwdb into /sdcard from which it can be retrieved 2014-04-29 06:43:11 -07:00
Eric House
4279457471 name change to remind what script is doing 2014-04-29 06:43:11 -07:00
Eric House
b4d5130588 Merge remote branch 'origin/android_localize' into android_localize 2014-04-29 06:39:35 -07:00
Eric House
7ea037d56a work with arrays of locales 2014-04-29 06:33:14 -07:00
Eric House
6c46ce2297 send and receive array of locales for translation info, one of which 
is the device's current default.  Plan's to include a fake as well if
set, but currently that replaces the default.
 2014-04-28 07:58:23 -07:00
Eric House
b42c372c79 send git version code, app package name, and git hash with all messages 2014-04-27 20:03:40 -07:00
Eric House
be817feb55 add git rev hash as constant (and usage()) 2014-04-27 20:03:08 -07:00
Eric House
19badff420 tweak text 2014-04-27 19:21:21 -07:00
Eric House
b87a7e808c don't fail building if scp fails 2014-04-27 19:08:04 -07:00
Eric House
33a83b0e2f toward use of data text messages for games: don't let CDMA phone users 
turn data messages on, and when checking if SMS is supported say yes
for KitKat users if they've successfully turned data on.
 2014-04-27 13:34:09 -07:00
Eric House
f386cd5c1b for consistency, createDialog -> onCreateDialog 2014-04-27 13:17:48 -07:00
Eric House
716109e979 Merge branch 'android_branch' into android_localize 
Conflicts:
	xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java
	xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
 2014-04-26 22:04:57 -07:00
Eric House
c82c59d985 experimental: enable SMS on KitKat if debug setting to use Data SMS is on 2014-04-26 20:04:55 -07:00
Eric House
fbb042ffee merge android_branch -> android_sms_kitkat 2014-04-26 18:31:05 -07:00
Eric House
ae4c6e98f2 replace escaped carraige returns and unicode from resources to get 
closer to what getString returns.  If I can't find an Android API to
do this it should be done on the server, but this is an improvement
until I do.
 2014-04-25 20:58:14 -07:00
Eric House
540eb73aec merge android_branch 2014-04-25 20:33:57 -07:00
Eric House
ead0fdf668 merge from_android_beta_82-> 2014-04-25 20:29:54 -07:00
Eric House
f954b09391 merge android_branch-> 2014-04-25 18:47:24 -07:00