Font size pref, reorder a few EntryTypes.

diff --git a/images/italian_sogni.png b/images/italian_sogni.png
index 41b5df1e11862ed769dd12026ccea9f2ef72da43..6f0e6471c426d98903dd1ad8de9c476c9406d144 100644 (file)
Binary files a/images/italian_sogni.png and b/images/italian_sogni.png differ

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4509546c261ec361107f8fcd3e492942b4464c62..9aed937f08c6bfffb7262c92139ed4b3ed48d64b 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -86,6 +86,10 @@
        <string name="wordListFileSummary">The local file where the word list will be appended.</string>
        <string name="wordListFileDefault">/sdcard/quickDic/wordList.txt</string>
 
+  <string name="fontSizeKey">fontSize</string>
+  <string name="fontSizeTitle">Font size</string>
+  <string name="fontSizeSummary">The size of the font for dictionary rows.</string>
+
   <string name="saveOnlyFirstSubentryKey">saveOnlyFirstSubentry</string>
   <string name="saveOnlyFirstSubentryTitle">Save only first sub-entry</string>
   <string name="saveOnlyFirstSubentrySummary">For entries with multiple sub-entries, only write the first to the word list.</string>

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index af00c8406c9b2957dbf24b48e822be23cba8f31a..d52c300eadbc41ffffec9a540d576d52d014bac8 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -8,6 +8,14 @@
     android:persistent="true"\r
        />\r
 \r
+  <EditTextPreference\r
+    android:key="@string/fontSizeKey"\r
+    android:title="@string/fontSizeTitle" \r
+    android:summary="@string/fontSizeSummary"\r
+    android:defaultValue="12"\r
+    android:persistent="true"\r
+  />\r
+\r
   <CheckBoxPreference \r
     android:key="@string/saveOnlyFirstSubentryKey"\r
     android:title="@string/saveOnlyFirstSubentryTitle"\r

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 966425eb34da6d6fcc1eebfde90b40110a1a7fae..00d4576012d7b5356bae9aec3ddcacf15335eee8 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -40,6 +40,7 @@ import android.text.Spannable;
 import android.text.TextWatcher;\r
 import android.text.style.StyleSpan;\r
 import android.util.Log;\r
+import android.util.TypedValue;\r
 import android.view.ContextMenu;\r
 import android.view.ContextMenu.ContextMenuInfo;\r
 import android.view.KeyEvent;\r
@@ -93,6 +94,7 @@ public class DictionaryActivity extends ListActivity {
   });\r
   private SearchOperation currentSearchOperation = null;\r
 \r
+  int fontSizeSp;\r
   EditText searchText;\r
   Button langButton;\r
 \r
@@ -207,11 +209,19 @@ public class DictionaryActivity extends ListActivity {
       }\r
     });\r
     \r
+    final String fontSize = prefs.getString(getString(R.string.fontSizeKey), "12");\r
+    try {\r
+      fontSizeSp = Integer.parseInt(fontSize);\r
+    } catch (NumberFormatException e) {\r
+      fontSizeSp = 12;\r
+    }\r
 \r
     setContentView(R.layout.dictionary_activity);\r
     searchText = (EditText) findViewById(R.id.SearchText);\r
+    searchText.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);\r
     \r
     langButton = (Button) findViewById(R.id.LangButton);\r
+    langButton.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);\r
     \r
     searchText.requestFocus();\r
     searchText.addTextChangedListener(searchTextWatcher);\r
@@ -632,7 +642,7 @@ public class DictionaryActivity extends ListActivity {
   // IndexAdapter\r
   // --------------------------------------------------------------------------\r
 \r
-  static final class IndexAdapter extends BaseAdapter {\r
+  final class IndexAdapter extends BaseAdapter {\r
     \r
     final Index index;\r
 \r
@@ -711,6 +721,9 @@ public class DictionaryActivity extends ListActivity {
 \r
         final String col2Text = index.swapPairEntries ? pair.lang1 : pair.lang2;\r
         column2.setText(col2Text, TextView.BufferType.NORMAL);\r
+        \r
+        column1.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);\r
+        column2.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);\r
 \r
         result.addView(tableRow);\r
       }\r
@@ -721,7 +734,7 @@ public class DictionaryActivity extends ListActivity {
     private View getView(TokenRow row, ViewGroup parent) {\r
       final TextView textView = new TextView(parent.getContext());\r
       textView.setText(row.getToken());\r
-      textView.setTextSize(20);\r
+      textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 6 * fontSizeSp / 5);\r
       return textView;\r
     }\r
     \r

diff --git a/src/com/hughes/android/dictionary/DictionaryListActivity.java b/src/com/hughes/android/dictionary/DictionaryListActivity.java
index 6dad97e5fcd3789925d2eedd2ebe1cf73c8ea1a2..004ce2be4edcb459d0faac295d1d187a14c15858 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryListActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryListActivity.java
@@ -25,6 +25,7 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -248,7 +249,7 @@ public class DictionaryListActivity extends ListActivity {
       }
 
       view.setText(name);
-      view.setTextSize(22);
+      view.setTextSize(TypedValue.COMPLEX_UNIT_SP, 22);
       tableLayout.addView(view);
 
       return tableLayout;

diff --git a/src/com/hughes/android/dictionary/engine/EntryTypeName.java b/src/com/hughes/android/dictionary/engine/EntryTypeName.java
index 27868d6c3d83055081236b01709e6d373c782c2d..1d5ca30b2ef50f4edc69c3fecdb476ad4a24dbec 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/EntryTypeName.java
+++ b/src/com/hughes/android/dictionary/engine/EntryTypeName.java
@@ -24,6 +24,7 @@ public enum EntryTypeName {
   WIKTIONARY_TITLE_SINGLE(0, true),
   WIKTIONARY_INFLECTD_FORM_SINGLE(0, true),
 
+
   NOUN(0),
   VERB(0),
   ADJ(0),
@@ -33,8 +34,8 @@ public enum EntryTypeName {
   MULTIROW_TAIL_ONE_WORD(0, true),
 
   WIKTIONARY_TITLE_MULTI(0, true),
+  WIKTIONARY_TRANSLITERATION(0),
   WIKTIONARY_INFLECTED_FORM_MULTI(0, true),
-  WIKTIONARY_TRANSLATION_SENSE(0),
   WIKTIONARY_ENGLISH_DEF_WIKI_LINK(0),
   WIKTIONARY_ENGLISH_DEF_OTHER_LANG(0),
   WIKTIONARY_ENGLISH_DEF(0),
@@ -50,13 +51,13 @@ public enum EntryTypeName {
   MULTIROW_HEAD_MANY_WORDS(0),
   MULTIROW_TAIL_MANY_WORDS(0),
   WIKTIONARY_EXAMPLE(0),
-  WIKTIONARY_BASE_FORM_SINGLE(0),  // These two should be eligible for removal....
+  WIKTIONARY_BASE_FORM_SINGLE(0),  // These two should be eligible for removal if the links are otherwise present.
   WIKTIONARY_BASE_FORM_MULTI(0),
   PART_OF_HYPHENATED(0),
   BRACKETED(0),
   PARENTHESIZED(0),
+  WIKTIONARY_TRANSLATION_SENSE(0),
   SEE_ALSO(0), 
-  WIKTIONARY_TRANSLITERATION(0),
   ;
 
   final int nameResId;

diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java
index 0e216cc9d2442399731eba5fe915428c71501b96..afbf584c36929523bb1e5fabacf8cfc546682b8d 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Language.java
+++ b/src/com/hughes/android/dictionary/engine/Language.java
@@ -14,9 +14,7 @@
 \r
 package com.hughes.android.dictionary.engine;\r
 \r
-import java.util.Arrays;\r
 import java.util.LinkedHashMap;\r
-import java.util.List;\r
 import java.util.Locale;\r
 import java.util.Map;\r
 \r
@@ -91,8 +89,6 @@ public class Language {
     isoCodeToWikiName.put("ZU", "Zulu");\r
   }\r
 \r
-  static final List<String> ISO_CODES_WITH_DICTS = Arrays.asList();\r
-\r
   static final Map<String, Language> symbolToLangauge = new LinkedHashMap<String, Language>();\r
 \r
   final String symbol;\r