]> gitweb.fperrin.net Git - Dictionary.git/commitdiff
projects / Dictionary.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 307aac7)
Add Slovak, increment version, show what's new.
authorThad Hughes <thad.hughes@gmail.com>
Wed, 4 Jan 2012 04:42:20 +0000 (20:42 -0800)
committerThad Hughes <thad.hughes@gmail.com>
Wed, 4 Jan 2012 04:42:20 +0000 (20:42 -0800)
AndroidManifest.xml patch | blob | history
res/values/strings.xml patch | blob | history
src/com/hughes/android/dictionary/DictionaryListActivity.java patch | blob | history
src/com/hughes/android/dictionary/QuickDicConfig.java patch | blob | history
src/com/hughes/android/dictionary/engine/Language.java patch | blob | history

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 49411b98d2c5b629426c42e4db4918dd8bf927bf..871f3b5f28ff59afc6d908a97d64deb476e3756b 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,8 +4,8 @@
  
  package="com.hughes.android.dictionary"
  
- android:versionCode="14"
- android:versionName="3.0.0"
+ android:versionCode="15"
+ android:versionName="3.0.1"
  android:installLocation="preferExternal">
 
  <uses-sdk android:minSdkVersion="4" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7fd11390f1be11e256b1a4c81a12d7f69bed51eb..ba26101cedafc377eb96c15cfee945ac7608ec55 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,10 +20,14 @@
   <string name="thanksForUpdating"><![CDATA[
 <html>
 <body>
-  Thanks for updating QuickDic.
+  Thanks for updating to QuickDic 3.0.1.
   <p> New features:
   <ul>
-    <li> Many more dictionaries based on enwiktionary.com data.
+    <li> QuickDic is open-source!
+    <li> Adjustable font size.
+    <li> Changeable click behavior.
+    <li> Several new dictionaries: Polish, Esperanto, Latin, Indonesian, many others... (based on enwiktionary.com data).
+    <li> All dictionaries updated (mostly with better formatting), and can be redownloaded at your leisure.
   </ul>
 </body>
 </html>
@@ -48,17 +52,17 @@
  
        <!-- Main -->
        <string name="searchText">Search Text</string>
-       <string name="downloadDictionary">Download dictionary...</string>
+       <string name="downloadDictionary">Download dictionary…</string>
        <string name="switchToLanguage">Switch to %s</string>
-       <string name="preferences">Preferences...</string>
-       <string name="about">About QuickDic...</string>
+       <string name="preferences">Preferences…</string>
+       <string name="about">About QuickDic…</string>
        <string name="addToWordList">Add to word list: %s</string>
   <string name="failedAddingToWordList">Failure adding to word list: %s</string>
-  <string name="unzippingDictionary">Unzipping dictionary...</string>
-  <string name="failedToUnzipDictionary">Failed to unzip dictionary...</string>
+  <string name="unzippingDictionary">Unzipping dictionary…</string>
+  <string name="failedToUnzipDictionary">Failed to unzip dictionary…</string>
 
        <!-- About. -->
-       <string name="titleWithVersion">QuickDic 3.0</string>
+       <string name="titleWithVersion">QuickDic 3.0.1</string>
        <string name="thadHughes">Thad Hughes</string>
        <string name="contactMe">If you\'re using QuickDic, I\'d love to hear from you.  Unfortunately, I cannot take responsibility for dictionary content (other than formatting), as it is generated from other sources. Please send comments, suggestions, bug reports, or just a quick hello to:</string>
        <string name="myEmail" formatted="false">thad.hughes@gmail.com</string>
@@ -69,7 +73,7 @@
   <string name="licenseUrl">http://www.apache.org/licenses/LICENSE-2.0</string>
  
        <!-- Download. -->
-  <string name="openingConnection">Opening connection...</string>
+  <string name="openingConnection">Opening connection…</string>
        <string name="downloading">Downloading: %1$,d of %2$,d bytes.</string>
   <string name="unzipping">Unzipping: %1$,d of %2$,d bytes.</string>
        <string name="downloadFinished">Finished: %,d bytes.</string>
diff --git a/src/com/hughes/android/dictionary/DictionaryListActivity.java b/src/com/hughes/android/dictionary/DictionaryListActivity.java
index 923a9181aa5d730775dea1df9f35962b90aa4af7..123e0b5354eba7876142a352cedd20e976ef9401 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryListActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryListActivity.java
@@ -71,7 +71,7 @@ public class DictionaryListActivity extends ListActivity {
     registerForContextMenu(getListView());
 
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-    final int introMessageId = -1;
+    final int introMessageId = 100;
     if (prefs.getInt(C.INTRO_MESSAGE_SHOWN, 0) < introMessageId) {
       final AlertDialog.Builder builder = new AlertDialog.Builder(this);
       builder.setCancelable(false);
@@ -115,13 +115,14 @@ public class DictionaryListActivity extends ListActivity {
       Log.d(LOG, "Dictionary list is old, updating it.");
       
       // Replace <-> with -
-      if (quickDicConfig.currentVersion == 3) {
+      if (quickDicConfig.currentVersion < 5) {
         for (final DictionaryConfig config : quickDicConfig.dictionaryConfigs) {
           config.name = config.name.replace("<->", "-");
         }
       }
       quickDicConfig.addDefaultDictionaries();
       quickDicConfig.currentVersion = QuickDicConfig.LATEST_VERSION;
+      PersistentObjectCache.init(this).write(C.DICTIONARY_CONFIGS, quickDicConfig);
     }
 
     setListAdapter(new Adapter());
diff --git a/src/com/hughes/android/dictionary/QuickDicConfig.java b/src/com/hughes/android/dictionary/QuickDicConfig.java
index c465c79257b48261b23ce06488f21f60e7e6424a..4de278fe9eb2031cd9eb91426869d852fcfd5d7c 100644 (file)
--- a/src/com/hughes/android/dictionary/QuickDicConfig.java
+++ b/src/com/hughes/android/dictionary/QuickDicConfig.java
@@ -25,7 +25,7 @@ public final class QuickDicConfig implements Serializable {
   private static final long serialVersionUID = 6711617368780900979L;
   
   // Just increment this to have them all update...
-  static final int LATEST_VERSION = 4;
+  static final int LATEST_VERSION = 5;
   
   final List<DictionaryConfig> dictionaryConfigs = new ArrayList<DictionaryConfig>();
   int currentVersion = LATEST_VERSION;
@@ -51,7 +51,7 @@ public final class QuickDicConfig implements Serializable {
       }
       final DictionaryConfig config = new DictionaryConfig();
       config.name = String.format("English-%s", Language.isoCodeToWikiName.get(iso));
-      config.downloadUrl = String.format("%sEN-%s_enwiktionary.quickdic.zip", BASE_URL, iso);
+      config.downloadUrl = String.format("%sEN-%s_enwiktionary.v002.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 b19f450538a8c8f47c422afa5de5cae60741efe7..84a625a569dbf7766b4f0da98332755ac10d7fe9 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Language.java
+++ b/src/com/hughes/android/dictionary/engine/Language.java
@@ -72,6 +72,7 @@ public class Language {
     isoCodeToWikiName.put("RU", "Russian");\r
     isoCodeToWikiName.put("SA", "Sanskrit");\r
     isoCodeToWikiName.put("SR", "Serbian");\r
+    isoCodeToWikiName.put("SK", "Slovak");\r
     isoCodeToWikiName.put("SO", "Somali");\r
     isoCodeToWikiName.put("ES", "Spanish");\r
     isoCodeToWikiName.put("SW", "Swahili");\r
"QuickDic" offline Dictionary App for Android. Provided downloadable dictionaries are based on Wiktionaries but can also be created from other sources (see DictionaryPC). Remember to use --recursive when cloning! Fork of project that used to be hosted at code.google.com/p/quickdic-dictionary.