From 2cdac2dd7a9496e0b6b84f560f4dd560538e4548 Mon Sep 17 00:00:00 2001
From: Thad Hughes <thad.hughes@gmail.com>
Date: Tue, 20 Dec 2011 17:31:18 -0800
Subject: [PATCH] String changes, focus changes.

---
 AndroidManifest.xml                           | 44 ++++++++++++-------
 res/values/strings.xml                        |  2 +-
 .../dictionary/DictionaryActivity.java        |  3 ++
 .../android/dictionary/QuickDicConfig.java    |  2 +-
 todo.txt                                      | 14 +++---
 5 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0dc4c87..f2c949b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,31 +4,45 @@
  
  package="com.hughes.android.dictionary"
  
- android:versionCode="13"
- android:versionName="2.0.4"
- android:installLocation="auto">
+ android:versionCode="14"
+ android:versionName="3.0.0"
+ android:installLocation="preferExternal">
 
  <uses-sdk android:minSdkVersion="4" />
-
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
- <application 
-  android:icon="@drawable/icon"
-  android:label="@string/app_name"
-  android:theme="@style/Theme.Light"
-  android:name=".DictionaryApplication" >
+ 
+   <!--
+    Because android:minSdkVersion is 3, these parameters default to
+    false, but we need them to be true.
+    See:
+    http://developer.android.com/guide/topics/manifest/supports-screens-element.html
+    -->
+  <supports-screens
+      android:resizeable="true"
+      android:anyDensity="true"
+      android:largeScreens="true"
+      />
+      
+   <!--   android:xlargeScreens="true" />  --> 
+
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+  <application 
+      android:icon="@drawable/icon"
+      android:label="@string/app_name"
+      android:theme="@style/Theme.Light"
+      android:name=".DictionaryApplication" >
   
 <!--   
   android:backupAgent="DictionaryBackupAgent"
   -->
 
   <meta-data android:name="com.google.android.backup.api_key"
-   android:value="AEdPqrEAAAAIUa0cU0ZHbBpYXJqm0vVUP5IAjr5D4iUeX7UwiQ" />
+      android:value="AEdPqrEAAAAIUa0cU0ZHbBpYXJqm0vVUP5IAjr5D4iUeX7UwiQ" />
 
   <activity android:name=".DictionaryListActivity"
-   android:label="@string/app_name">
+      android:label="@string/app_name">
 
     <intent-filter>
       <action android:name="android.intent.action.MAIN" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8422b44..faae24d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -51,7 +51,7 @@
 	<string name="downloadDictionary">Download dictionary...</string>
 	<string name="switchToLanguage">Switch to %s</string>
 	<string name="preferences">Preferences...</string>
-	<string name="about">About...</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>
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 8353fba..e6eb3d1 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -496,6 +496,9 @@ public class DictionaryActivity extends ListActivity {
   }
 
   void onCopy(final RowBase row) {
+    // Request focus so that if we start typing again, it clears the text input.
+    getListView().requestFocus();
+
     Log.d(LOG, "Copy, row=" + row);
     final StringBuilder result = new StringBuilder();
     result.append(row.getRawText(false));
diff --git a/src/com/hughes/android/dictionary/QuickDicConfig.java b/src/com/hughes/android/dictionary/QuickDicConfig.java
index 74ad1d8..b042d40 100644
--- a/src/com/hughes/android/dictionary/QuickDicConfig.java
+++ b/src/com/hughes/android/dictionary/QuickDicConfig.java
@@ -34,7 +34,7 @@ public final class QuickDicConfig implements Serializable {
     addDefaultDictionaries();
   }
   
-  static final String BASE_URL = "http://dictionarydata.quickdic-dictionary.googlecode.com/git/outputs/";
+  static final String BASE_URL = "http://quickdic-dictionary.googlecode.com/files/";
 
   public void addDefaultDictionaries() {
     {
diff --git a/todo.txt b/todo.txt
index 01ef3c9..02d4b7b 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,17 +1,15 @@
-new version requires re-download of ~25MB dictionary file.
-
-* wiktionary
 * multi word search
+* link to leo, dict.cc
 * source in context menu
 * quiz
-* link to leo, dict.cc
 * colorize things
-* better tokenization?
-* test email
-* dict manager
-* publish 2.0 dictionary
 
 
 done:
 * sorting of entries
 * better Row/Entry classes?
+* wiktionary
+* better tokenization?
+* publish 2.0 dictionary
+* test email
+* dict manager
-- 
2.43.0