Try to fix crash.

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryActivity.java

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 966425eb34da6d6fcc1eebfde90b40110a1a7fae..84497e51ac205c1b233197f2a4f5de1c0a1e3840 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,9 +209,16 @@ 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
     \r
@@ -468,7 +477,7 @@ public class DictionaryActivity extends ListActivity {
   \r
   @Override\r
   protected void onListItemClick(ListView l, View v, int row, long id) {\r
-    if (clickOpensContextMenu) {\r
+    if (clickOpensContextMenu && dictRaf != null) {\r
       openContextMenu(v);\r
     }\r
   }\r
@@ -632,7 +641,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 +720,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 +733,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, 5 * fontSizeSp / 4);\r
       return textView;\r
     }\r
     \r