From: Thad Hughes <thad.hughes@gmail.com>
Date: Sun, 25 Dec 2011 20:15:40 +0000 (-0800)
Subject: Font size pref, reorder a few EntryTypes.
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=67c3e9eccdd20c48b9b93b2ae18cd28404835bd5

Font size pref, reorder a few EntryTypes.
---

diff --git a/images/italian_sogni.png b/images/italian_sogni.png
index 41b5df1..6f0e647 100644
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 4509546..9aed937 100644
--- 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 af00c84..d52c300 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -8,6 +8,14 @@
     android:persistent="true"
 	/>
 
+  <EditTextPreference
+    android:key="@string/fontSizeKey"
+    android:title="@string/fontSizeTitle" 
+    android:summary="@string/fontSizeSummary"
+    android:defaultValue="12"
+    android:persistent="true"
+  />
+
   <CheckBoxPreference 
     android:key="@string/saveOnlyFirstSubentryKey"
     android:title="@string/saveOnlyFirstSubentryTitle"
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 966425e..00d4576 100644
--- 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;
 import android.text.style.StyleSpan;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.KeyEvent;
@@ -93,6 +94,7 @@ public class DictionaryActivity extends ListActivity {
   });
   private SearchOperation currentSearchOperation = null;
 
+  int fontSizeSp;
   EditText searchText;
   Button langButton;
 
@@ -207,11 +209,19 @@ public class DictionaryActivity extends ListActivity {
       }
     });
     
+    final String fontSize = prefs.getString(getString(R.string.fontSizeKey), "12");
+    try {
+      fontSizeSp = Integer.parseInt(fontSize);
+    } catch (NumberFormatException e) {
+      fontSizeSp = 12;
+    }
 
     setContentView(R.layout.dictionary_activity);
     searchText = (EditText) findViewById(R.id.SearchText);
+    searchText.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
     
     langButton = (Button) findViewById(R.id.LangButton);
+    langButton.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
     
     searchText.requestFocus();
     searchText.addTextChangedListener(searchTextWatcher);
@@ -632,7 +642,7 @@ public class DictionaryActivity extends ListActivity {
   // IndexAdapter
   // --------------------------------------------------------------------------
 
-  static final class IndexAdapter extends BaseAdapter {
+  final class IndexAdapter extends BaseAdapter {
     
     final Index index;
 
@@ -711,6 +721,9 @@ public class DictionaryActivity extends ListActivity {
 
         final String col2Text = index.swapPairEntries ? pair.lang1 : pair.lang2;
         column2.setText(col2Text, TextView.BufferType.NORMAL);
+        
+        column1.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
+        column2.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
 
         result.addView(tableRow);
       }
@@ -721,7 +734,7 @@ public class DictionaryActivity extends ListActivity {
     private View getView(TokenRow row, ViewGroup parent) {
       final TextView textView = new TextView(parent.getContext());
       textView.setText(row.getToken());
-      textView.setTextSize(20);
+      textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 6 * fontSizeSp / 5);
       return textView;
     }
     
diff --git a/src/com/hughes/android/dictionary/DictionaryListActivity.java b/src/com/hughes/android/dictionary/DictionaryListActivity.java
index 6dad97e..004ce2b 100644
--- 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 27868d6..1d5ca30 100644
--- 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 0e216cc..afbf584 100644
--- a/src/com/hughes/android/dictionary/engine/Language.java
+++ b/src/com/hughes/android/dictionary/engine/Language.java
@@ -14,9 +14,7 @@
 
 package com.hughes.android.dictionary.engine;
 
-import java.util.Arrays;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -91,8 +89,6 @@ public class Language {
     isoCodeToWikiName.put("ZU", "Zulu");
   }
 
-  static final List<String> ISO_CODES_WITH_DICTS = Arrays.asList();
-
   static final Map<String, Language> symbolToLangauge = new LinkedHashMap<String, Language>();
 
   final String symbol;