UI changes, (experiments), Arabic rendering changes, changing the way

[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 d217c8191b1010ac7053f7e337cd47821a75882d..a3cc390e3991936423de0427d6dd5177d219606f 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -66,6 +66,7 @@ import android.widget.Toast;
 \r
 import com.hughes.android.dictionary.engine.Dictionary;\r
 import com.hughes.android.dictionary.engine.Index;\r
+import com.hughes.android.dictionary.engine.Language;\r
 import com.hughes.android.dictionary.engine.PairEntry;\r
 import com.hughes.android.dictionary.engine.PairEntry.Pair;\r
 import com.hughes.android.dictionary.engine.RowBase;\r
@@ -116,11 +117,19 @@ public class DictionaryActivity extends ListActivity {
   \r
   public static Intent getIntent(final Context context, final int dictIndex, final int indexIndex, final String searchToken) {\r
     setDictionaryPrefs(context, dictIndex, indexIndex, searchToken);\r
-    \r
     final Intent intent = new Intent();\r
     intent.setClassName(DictionaryActivity.class.getPackage().getName(), DictionaryActivity.class.getName());\r
     return intent;\r
   }\r
+  \r
+  // TODO: Can we trigger an App restart when the preferences activity gets opened?\r
+  // TODO: fix these...\r
+\r
+  @Override\r
+  protected void onSaveInstanceState(final Bundle outState) {\r
+    super.onSaveInstanceState(outState);\r
+    setDictionaryPrefs(this, dictIndex, indexIndex, searchText.getText().toString());\r
+  }\r
 \r
   public static void setDictionaryPrefs(final Context context,\r
       final int dictIndex, final int indexIndex, final String searchToken) {\r
@@ -130,9 +139,10 @@ public class DictionaryActivity extends ListActivity {
     prefs.putString(C.SEARCH_TOKEN, searchToken);\r
     prefs.commit();\r
   }\r
-\r
+  \r
   public static void clearDictionaryPrefs(final Context context) {\r
-    final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(context).edit();\r
+    final SharedPreferences.Editor prefs = PreferenceManager\r
+        .getDefaultSharedPreferences(context).edit();\r
     prefs.remove(C.DICT_INDEX);\r
     prefs.remove(C.INDEX_INDEX);\r
     prefs.remove(C.SEARCH_TOKEN);\r
@@ -153,7 +163,7 @@ public class DictionaryActivity extends ListActivity {
       QuickDicConfig quickDicConfig = PersistentObjectCache.init(\r
           this).read(C.DICTIONARY_CONFIGS, QuickDicConfig.class);\r
       dictIndex = prefs.getInt(C.DICT_INDEX, 0) ;\r
-      final DictionaryConfig dictionaryConfig = quickDicConfig.dictionaryConfigs.get(dictIndex);\r
+      final DictionaryInfo dictionaryConfig = quickDicConfig.dictionaryConfigs.get(dictIndex);\r
       this.setTitle("QuickDic: " + dictionaryConfig.name);\r
       dictRaf = new RandomAccessFile(dictionaryConfig.localFile, "r");\r
       dictionary = new Dictionary(dictRaf); \r
@@ -168,7 +178,7 @@ public class DictionaryActivity extends ListActivity {
         dictRaf = null;\r
       }\r
       Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()), Toast.LENGTH_LONG);\r
-      startActivity(DictionaryEditActivity.getIntent(dictIndex));\r
+      startActivity(DictionaryManagerActivity.getIntent(this));\r
       finish();\r
       return;\r
     }\r
@@ -196,7 +206,7 @@ public class DictionaryActivity extends ListActivity {
         });\r
         \r
         for (final Index index : dictionary.indices) {\r
-          Log.d(LOG, "Starting collator load for lang=" + index.sortLanguage.getSymbol());\r
+          Log.d(LOG, "Starting collator load for lang=" + index.sortLanguage.getIsoCode());\r
           \r
           final com.ibm.icu.text.Collator c = index.sortLanguage.getCollator();          \r
           if (c.compare("pre-print", "preppy") >= 0) {\r
@@ -295,6 +305,11 @@ public class DictionaryActivity extends ListActivity {
   @Override\r
   protected void onResume() {\r
     super.onResume();\r
+    if (PreferenceActivity.prefsMightHaveChanged) {\r
+      PreferenceActivity.prefsMightHaveChanged = false;\r
+      finish();\r
+      startActivity(getIntent());\r
+    }\r
   }\r
   \r
   @Override\r
@@ -402,6 +417,7 @@ public class DictionaryActivity extends ListActivity {
       final MenuItem preferences = menu.add(getString(R.string.preferences));\r
       preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
         public boolean onMenuItemClick(final MenuItem menuItem) {\r
+          PreferenceActivity.prefsMightHaveChanged = true;\r
           startActivity(new Intent(DictionaryActivity.this,\r
               PreferenceActivity.class));\r
           return false;\r
@@ -413,7 +429,7 @@ public class DictionaryActivity extends ListActivity {
       final MenuItem dictionaryList = menu.add(getString(R.string.dictionaryList));\r
       dictionaryList.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
         public boolean onMenuItemClick(final MenuItem menuItem) {\r
-          startActivity(DictionaryListActivity.getIntent(DictionaryActivity.this));\r
+          startActivity(DictionaryManagerActivity.getIntent(DictionaryActivity.this));\r
           finish();\r
           return false;\r
         }\r
@@ -545,14 +561,12 @@ public class DictionaryActivity extends ListActivity {
       return true;\r
     }\r
     if (keyCode == KeyEvent.KEYCODE_BACK) {\r
-      Log.d(LOG, "Clearing dictionary prefs.");\r
-      DictionaryActivity.clearDictionaryPrefs(this);\r
     }\r
     if (keyCode == KeyEvent.KEYCODE_ENTER) {\r
-//      Log.d(LOG, "Trying to hide soft keyboard.");\r
-//      final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);\r
-//      manager.hideSoftInputFromWindow(searchText, InputMethodManager.SHOW_FORCED);\r
-\r
+      Log.d(LOG, "Trying to hide soft keyboard.");\r
+      final InputMethodManager inputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);\r
+      inputManager.hideSoftInputFromWindow(this.getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);\r
+      return true;\r
     }\r
     return super.onKeyDown(keyCode, event);\r
   }\r
@@ -720,7 +734,7 @@ public class DictionaryActivity extends ListActivity {
 \r
         // TODO: color words by gender\r
         final Pair pair = entry.pairs.get(r);\r
-        final String col1Text = index.swapPairEntries ? pair.lang2 : pair.lang1;\r
+        final String col1Text = Language.fixBidiText(index.swapPairEntries ? pair.lang2 : pair.lang1);\r
         column1.setText(col1Text, TextView.BufferType.SPANNABLE);\r
         final Spannable col1Spannable = (Spannable) column1.getText();\r
         \r
@@ -732,7 +746,8 @@ public class DictionaryActivity extends ListActivity {
           startPos += token.length();\r
         }\r
 \r
-        final String col2Text = index.swapPairEntries ? pair.lang1 : pair.lang2;\r
+        String col2Text = index.swapPairEntries ? pair.lang1 : pair.lang2;\r
+        col2Text = Language.fixBidiText(col2Text);\r
         column2.setText(col2Text, TextView.BufferType.NORMAL);\r
         \r
         column1.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);\r
@@ -745,8 +760,13 @@ public class DictionaryActivity extends ListActivity {
     }\r
 \r
     private View getView(TokenRow row, ViewGroup parent) {\r
-      final TextView textView = new TextView(parent.getContext());\r
+      final Context context = parent.getContext();\r
+      final TextView textView = new TextView(context);\r
       textView.setText(row.getToken());\r
+      textView.setBackgroundResource(R.drawable.token_row_drawable);\r
+      // Doesn't work:\r
+      //textView.setTextColor(android.R.color.secondary_text_light);\r
+      textView.setTextAppearance(context, R.style.Theme_Light_Token);\r
       textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 5 * fontSizeSp / 4);\r
       return textView;\r
     }\r