From 818f4daf80d32fae60f084bfd77be926d554ae98 Mon Sep 17 00:00:00 2001 From: Thad Hughes Date: Mon, 19 Dec 2011 11:07:44 -0800 Subject: [PATCH] New icon, new dictionary naming, store on code.google.com, fix Hebrew, better about. --- res/drawable/icon.png | Bin 5797 -> 4544 bytes res/layout/about_activity.xml | 12 ++++++-- res/values/strings.xml | 15 +++++----- .../dictionary/DictionaryActivity.java | 26 +++++++++++++++++- .../dictionary/DictionaryListActivity.java | 15 +++++++--- .../android/dictionary/QuickDicConfig.java | 8 ++++-- .../android/dictionary/engine/Language.java | 2 +- 7 files changed, 60 insertions(+), 18 deletions(-) mode change 100755 => 100644 res/layout/about_activity.xml diff --git a/res/drawable/icon.png b/res/drawable/icon.png index 9266d93ec2ef6272eac8abf7dc053631162c47b1..c2fe5ffbbc0d1f8b86f2cf14ac3ed9c6e03dfca9 100644 GIT binary patch literal 4544 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 j3C!6MjQ>{u&(Hq_K + + Remove all dictionaries Edit dictionary config Delete dictionary - Move up - New Dictionary + Move to top + New dictionary + %s (not on device) @@ -22,9 +23,8 @@ Thanks for updating QuickDic.

New features:

    -
  • Easily work with multiple dictionaries. +
  • Many more dictionaries based on enwiktionary.com data.
-

The new version requires you to re-download dictionaries you want to use.
]]> @@ -58,14 +58,15 @@ Failed to unzip dictionary... - QuickDic 2.0 + QuickDic 3.0 Thad Hughes - If you\'re using QuickDic, I\'d love to hear from you. Please send comments, suggestions, bug reports, or just a quick hello to: + If you\'re using QuickDic, I\'d love to hear from you. Unfortunately, I cannot take responsibility for dictionary content, as it is generated from other sources. Please send comments, suggestions, bug reports, or just a quick hello to: thad.hughes@gmail.com For more information, see: http://sites.google.com/site/quickdic/home - http://www.apache.org/licenses/LICENSE-2.0 + QuickDic contains code copyrighted by Google and released under the Apache 2.0 license. + http://www.apache.org/licenses/LICENSE-2.0 Opening connection... diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java index 1bfdc29..270bd3d 100644 --- a/src/com/hughes/android/dictionary/DictionaryActivity.java +++ b/src/com/hughes/android/dictionary/DictionaryActivity.java @@ -209,6 +209,8 @@ public class DictionaryActivity extends ListActivity { setContentView(R.layout.dictionary_activity); searchText = (EditText) findViewById(R.id.SearchText); + searchText.set + langButton = (Button) findViewById(R.id.LangButton); searchText.requestFocus(); @@ -334,7 +336,7 @@ public class DictionaryActivity extends ListActivity { searchText.requestFocus(); Log.d(LOG, "Trying to show soft keyboard."); final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT); + manager.showSoftInput(searchText, InputMethodManager.SHOW_FORCED); } void updateLangButton() { @@ -419,6 +421,18 @@ public class DictionaryActivity extends ListActivity { }); } + { + final MenuItem about = menu.add(getString(R.string.about)); + about.setOnMenuItemClickListener(new OnMenuItemClickListener() { + public boolean onMenuItemClick(final MenuItem menuItem) { + final Intent intent = new Intent().setClassName(AboutActivity.class + .getPackage().getName(), AboutActivity.class.getCanonicalName()); + startActivity(intent); + return false; + } + }); + } + return true; } @@ -465,6 +479,10 @@ public class DictionaryActivity extends ListActivity { rawText.append(row.getTokenRow(true).getToken()).append("\t"); rawText.append(row.getRawText(saveOnlyFirstSubentry)); Log.d(LOG, "Writing : " + rawText); + + // Request focus so that if we start typing again, it clears the text input. + getListView().requestFocus(); + try { wordList.getParentFile().mkdirs(); final PrintWriter out = new PrintWriter( @@ -501,6 +519,12 @@ public class DictionaryActivity extends ListActivity { Log.d(LOG, "Clearing dictionary prefs."); DictionaryActivity.clearDictionaryPrefs(this); } + if (keyCode == KeyEvent.KEYCODE_ENTER) { + Log.d(LOG, "Trying to hide soft keyboard."); + final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + manager.hideSoftInputFromWindow(searchText, InputMethodManager.SHOW_FORCED); + + } return super.onKeyDown(keyCode, event); } diff --git a/src/com/hughes/android/dictionary/DictionaryListActivity.java b/src/com/hughes/android/dictionary/DictionaryListActivity.java index b6ac370..c10fc62 100644 --- a/src/com/hughes/android/dictionary/DictionaryListActivity.java +++ b/src/com/hughes/android/dictionary/DictionaryListActivity.java @@ -14,6 +14,8 @@ package com.hughes.android.dictionary; +import java.io.File; + import android.app.AlertDialog; import android.app.ListActivity; import android.content.Context; @@ -188,12 +190,12 @@ public class DictionaryListActivity extends ListActivity { }); if (adapterContextMenuInfo.position > 0) { - final MenuItem moveUpMenuItem = menu.add(R.string.moveUp); - moveUpMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() { + final MenuItem moveToTopMenuItem = menu.add(R.string.moveToTop); + moveToTopMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { final DictionaryConfig dictionaryConfig = quickDicConfig.dictionaryConfigs.remove(adapterContextMenuInfo.position); - quickDicConfig.dictionaryConfigs.add(adapterContextMenuInfo.position - 1, dictionaryConfig); + quickDicConfig.dictionaryConfigs.add(0, dictionaryConfig); dictionaryConfigsChanged(); return true; } @@ -239,8 +241,13 @@ public class DictionaryListActivity extends ListActivity { final DictionaryConfig dictionaryConfig = getItem(position); final TableLayout tableLayout = new TableLayout(parent.getContext()); final TextView view = new TextView(parent.getContext()); + + String name = dictionaryConfig.name; + if (!new File(dictionaryConfig.localFile).canRead()) { + name = getString(R.string.notOnDevice, dictionaryConfig.name); + } - view.setText(dictionaryConfig.name); + view.setText(name); view.setTextSize(20); tableLayout.addView(view); diff --git a/src/com/hughes/android/dictionary/QuickDicConfig.java b/src/com/hughes/android/dictionary/QuickDicConfig.java index 306ff80..74ad1d8 100644 --- a/src/com/hughes/android/dictionary/QuickDicConfig.java +++ b/src/com/hughes/android/dictionary/QuickDicConfig.java @@ -33,12 +33,14 @@ public final class QuickDicConfig implements Serializable { public QuickDicConfig() { addDefaultDictionaries(); } + + static final String BASE_URL = "http://dictionarydata.quickdic-dictionary.googlecode.com/git/outputs/"; public void addDefaultDictionaries() { { final DictionaryConfig config = new DictionaryConfig(); config.name = "German<->English"; - config.downloadUrl = "https://sites.google.com/site/quickdic/dictionaries-1/DE-EN_chemnitz_enwiktionary.quickdic.zip?attredirects=0&d=1"; + config.downloadUrl = BASE_URL + "DE-EN_chemnitz_enwiktionary.quickdic.zip"; config.localFile = "/sdcard/quickDic/DE-EN_chemnitz_enwiktionary.quickdic"; addOrReplace(config); } @@ -48,8 +50,8 @@ public final class QuickDicConfig implements Serializable { continue; } final DictionaryConfig config = new DictionaryConfig(); - config.name = String.format("EN<->%s English<->%s (Wiktionary)", iso, Language.isoCodeToWikiName.get(iso)); - config.downloadUrl = String.format("https://sites.google.com/site/quickdic/dictionaries-1/EN-%s_enwiktionary.quickdic.zip?attredirects=0&d=1", iso); + config.name = String.format("English<->%s", Language.isoCodeToWikiName.get(iso)); + config.downloadUrl = String.format("%sEN-%s_enwiktionary.quickdic.zip", BASE_URL, iso); config.localFile = String.format("/sdcard/quickDic/EN-%s_enwiktionary.quickdic", iso); addOrReplace(config); } diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java index c3cb84b..cd296f8 100644 --- a/src/com/hughes/android/dictionary/engine/Language.java +++ b/src/com/hughes/android/dictionary/engine/Language.java @@ -57,7 +57,7 @@ public class Language { isoCodeToWikiName.put("DE", "German"); isoCodeToWikiName.put("EL", "Greek"); isoCodeToWikiName.put("haw", "Hawaiian"); - isoCodeToWikiName.put("HE", "Hewbrew"); + isoCodeToWikiName.put("HE", "Hebrew"); isoCodeToWikiName.put("HI", "Hindi"); isoCodeToWikiName.put("IS", "Icelandic"); isoCodeToWikiName.put("GA", "Irish"); -- 2.43.0