import android.content.Intent;\r
import android.content.SharedPreferences;\r
import android.graphics.Typeface;\r
+import android.net.Uri;\r
import android.os.Bundle;\r
import android.os.Handler;\r
import android.preference.PreferenceManager;\r
import android.widget.BaseAdapter;\r
import android.widget.Button;\r
import android.widget.EditText;\r
+import android.widget.ImageView;\r
import android.widget.LinearLayout;\r
import android.widget.ListAdapter;\r
import android.widget.ListView;\r
import com.hughes.android.dictionary.engine.Dictionary;\r
import com.hughes.android.dictionary.engine.EntrySource;\r
import com.hughes.android.dictionary.engine.Index;\r
-import com.hughes.android.dictionary.engine.PairEntry;\r
import com.hughes.android.dictionary.engine.Index.IndexEntry;\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
import com.hughes.android.dictionary.engine.TokenRow;\r
ListAdapter indexAdapter = null;\r
\r
final SearchTextWatcher searchTextWatcher = new SearchTextWatcher();\r
+ \r
+ /**\r
+ * For some languages, loading the transliterators used in this search takes\r
+ * a long time, so we fire it up on a different thread, and don't invoke it\r
+ * from the main thread until it's already finished once.\r
+ */\r
+ private volatile boolean indexPrepFinished = false;\r
+\r
\r
\r
public DictionaryActivity() {\r
protected void onSaveInstanceState(final Bundle outState) {\r
super.onSaveInstanceState(outState);\r
Log.d(LOG, "onSaveInstanceState: " + searchText.getText().toString());\r
+ outState.putInt(C.INDEX_INDEX, indexIndex);\r
outState.putString(C.SEARCH_TOKEN, searchText.getText().toString());\r
}\r
\r
protected void onRestoreInstanceState(final Bundle outState) {\r
super.onRestoreInstanceState(outState);\r
Log.d(LOG, "onRestoreInstanceState: " + outState.getString(C.SEARCH_TOKEN));\r
- initialSearchText = outState.getString(C.SEARCH_TOKEN);\r
+ onCreate(outState);\r
}\r
\r
@Override\r
}\r
dictRaf = null;\r
}\r
- Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()), Toast.LENGTH_LONG);\r
+ Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()), Toast.LENGTH_LONG).show();\r
startActivity(DictionaryManagerActivity.getLaunchIntent());\r
finish();\r
return;\r
}\r
-\r
- indexIndex = intent.getIntExtra(C.INDEX_INDEX, 0) % dictionary.indices.size();\r
+ indexIndex = intent.getIntExtra(C.INDEX_INDEX, 0);\r
+ if (savedInstanceState != null) {\r
+ indexIndex = savedInstanceState.getInt(C.INDEX_INDEX, indexIndex);\r
+ }\r
+ indexIndex %= dictionary.indices.size();\r
Log.d(LOG, "Loading index " + indexIndex);\r
index = dictionary.indices.get(indexIndex);\r
setListAdapter(new IndexAdapter(index));\r
\r
// Pre-load the collators.\r
- searchExecutor.execute(new Runnable() {\r
+ new Thread(new Runnable() {\r
public void run() {\r
final long startMillis = System.currentTimeMillis();\r
- \r
- TransliteratorManager.init(new TransliteratorManager.Callback() {\r
- @Override\r
- public void onTransliteratorReady() {\r
- uiHandler.post(new Runnable() {\r
- @Override\r
- public void run() {\r
- onSearchTextChange(searchText.getText().toString());\r
- }\r
- });\r
- }\r
- });\r
- \r
- for (final Index index : dictionary.indices) {\r
- Log.d(LOG, "Starting collator load for lang=" + index.sortLanguage.getIsoCode());\r
+ try {\r
+ TransliteratorManager.init(new TransliteratorManager.Callback() {\r
+ @Override\r
+ public void onTransliteratorReady() {\r
+ uiHandler.post(new Runnable() {\r
+ @Override\r
+ public void run() {\r
+ onSearchTextChange(searchText.getText().toString());\r
+ }\r
+ });\r
+ }\r
+ });\r
\r
- final com.ibm.icu.text.Collator c = index.sortLanguage.getCollator(); \r
- if (c.compare("pre-print", "preppy") >= 0) {\r
- Log.e(LOG, c.getClass()\r
- + " is buggy, lookups may not work properly.");\r
+ for (final Index index : dictionary.indices) {\r
+ final String searchToken = index.sortedIndexEntries.get(0).token;\r
+ final IndexEntry entry = index.findExact(searchToken);\r
+ if (!searchToken.equals(entry.token)) {\r
+ Log.e(LOG, "Couldn't find token: " + searchToken + ", " + entry.token);\r
+ }\r
}\r
+ indexPrepFinished = true;\r
+ } catch (Exception e) {\r
+ Log.w(LOG, "Exception while prepping. This can happen if dictionary is closed while search is happening.");\r
}\r
- Log.d(LOG, "Loading collators took:"\r
- + (System.currentTimeMillis() - startMillis));\r
+ Log.d(LOG, "Prepping indices took:"\r
+ + (System.currentTimeMillis() - startMillis));\r
}\r
- });\r
+ }).start();\r
\r
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);\r
\r
\r
searchText.requestFocus();\r
searchText.addTextChangedListener(searchTextWatcher);\r
- final String search = prefs.getString(C.SEARCH_TOKEN, "");\r
- searchText.setText(search);\r
- searchText.setSelection(0, search.length());\r
- Log.d(LOG, "Trying to restore searchText=" + search);\r
+ String text = "";\r
+ if (savedInstanceState != null) {\r
+ text = savedInstanceState.getString(C.SEARCH_TOKEN);\r
+ if (text == null) {\r
+ text = "";\r
+ }\r
+ }\r
+ setSearchText(text, true);\r
+ Log.d(LOG, "Trying to restore searchText=" + text);\r
\r
final Button clearSearchTextButton = (Button) findViewById(R.id.ClearSearchTextButton);\r
clearSearchTextButton.setOnClickListener(new OnClickListener() {\r
startActivity(getIntent());\r
}\r
if (initialSearchText != null) {\r
- setSearchText(initialSearchText);\r
+ setSearchText(initialSearchText, true);\r
}\r
}\r
\r
currentSearchOperation.interrupted.set(true);\r
currentSearchOperation = null;\r
}\r
- changeIndex((indexIndex + 1)% dictionary.indices.size());\r
+ changeIndexGetFocusAndResearch((indexIndex + 1)% dictionary.indices.size());\r
}\r
\r
void onLanguageButtonLongClick(final Context context) {\r
}\r
\r
\r
- private void changeIndex(final int newIndex) {\r
+ private void changeIndexGetFocusAndResearch(final int newIndex) {\r
indexIndex = newIndex;\r
index = dictionary.indices.get(indexIndex);\r
indexAdapter = new IndexAdapter(index);\r
for (final EntrySource source : dictionary.sources) {\r
builder.append(getString(R.string.sourceInfo, source.getName(), source.getNumEntries())).append("\n");\r
}\r
- } else {\r
- builder.append(getString(R.string.invalidDictionary));\r
}\r
+// } else {\r
+// builder.append(getString(R.string.invalidDictionary));\r
+// }\r
textView.setText(builder.toString());\r
\r
dialog.show();\r
int indexToUse = -1;\r
for (int i = 0; i < dictionary.indices.size(); ++i) {\r
final Index index = dictionary.indices.get(i);\r
- final IndexEntry indexEntry = index.findExact(selectedText); \r
- final TokenRow tokenRow = index.rows.get(indexEntry.startRow).getTokenRow(false);\r
- if (tokenRow != null && tokenRow.hasMainEntry) {\r
- indexToUse = i;\r
- break;\r
+ if (indexPrepFinished) {\r
+ System.out.println("Doing index lookup: on " + selectedText);\r
+ final IndexEntry indexEntry = index.findExact(selectedText);\r
+ if (indexEntry != null) {\r
+ final TokenRow tokenRow = index.rows.get(indexEntry.startRow).getTokenRow(false);\r
+ if (tokenRow != null && tokenRow.hasMainEntry) {\r
+ indexToUse = i;\r
+ break;\r
+ }\r
+ }\r
+ } else {\r
+ Log.w(LOG, "Skipping findExact on index " + index.shortName);\r
}\r
}\r
if (indexToUse == -1) {\r
indexToUse = selectedSpannableIndex;\r
}\r
- if (indexIndex != indexToUse) {\r
- changeIndex(indexToUse);\r
+ final boolean changeIndex = indexIndex != indexToUse;\r
+ setSearchText(selectedText, !changeIndex); // If we're not changing index, we have to triggerSearch.\r
+ if (changeIndex) {\r
+ changeIndexGetFocusAndResearch(indexToUse);\r
}\r
- setSearchText(selectedText);\r
+ // Give focus back to list view because typing is done.\r
+ getListView().requestFocus();\r
return false;\r
}\r
});\r
public boolean onKeyDown(final int keyCode, final KeyEvent event) {\r
if (event.getUnicodeChar() != 0) {\r
if (!searchText.hasFocus()) {\r
- setSearchText("" + (char) event.getUnicodeChar());\r
+ setSearchText("" + (char) event.getUnicodeChar(), true);\r
}\r
return true;\r
}\r
return super.onKeyDown(keyCode, event);\r
}\r
\r
- private void setSearchText(final String text) {\r
+ private void setSearchText(final String text, final boolean triggerSearch) {\r
+ if (!triggerSearch) {\r
+ getListView().requestFocus();\r
+ }\r
searchText.setText(text);\r
searchText.requestFocus();\r
- onSearchTextChange(searchText.getText().toString());\r
if (searchText.getLayout() != null) {\r
// Surprising, but this can crash when you rotate...\r
Selection.moveToRightEdge(searchText.getText(), searchText.getLayout());\r
}\r
+ if (triggerSearch) {\r
+ onSearchTextChange(text);\r
+ }\r
}\r
\r
\r
}\r
\r
@Override\r
- public View getView(int position, final View convertView, ViewGroup parent) {\r
+ public TableLayout getView(int position, View convertView, ViewGroup parent) {\r
+ final TableLayout result;\r
+ if (convertView instanceof TableLayout) {\r
+ result = (TableLayout) convertView;\r
+ result.removeAllViews();\r
+ } else {\r
+ result = new TableLayout(parent.getContext());\r
+ }\r
final RowBase row = getItem(position);\r
if (row instanceof PairEntry.Row) {\r
- return getView(position, (PairEntry.Row) row, parent, convertView);\r
+ return getView(position, (PairEntry.Row) row, parent, result);\r
} else if (row instanceof TokenRow) {\r
- return getView((TokenRow) row, parent, convertView);\r
+ return getView((TokenRow) row, parent, result);\r
} else {\r
throw new IllegalArgumentException("Unsupported Row type: " + row.getClass());\r
}\r
}\r
\r
- private View getView(final int position, PairEntry.Row row, ViewGroup parent, final View convertView) {\r
- final TableLayout result = new TableLayout(parent.getContext());\r
+ private TableLayout getView(final int position, PairEntry.Row row, ViewGroup parent, final TableLayout result) {\r
final PairEntry entry = row.getEntry();\r
final int rowCount = entry.pairs.size();\r
+ \r
+ final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams();\r
+ layoutParams.weight = 0.5f;\r
+ \r
for (int r = 0; r < rowCount; ++r) {\r
final TableRow tableRow = new TableRow(result.getContext());\r
\r
final TextView col1 = new TextView(tableRow.getContext());\r
final TextView col2 = new TextView(tableRow.getContext());\r
- final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams();\r
- layoutParams.weight = 0.5f;\r
\r
// Set the columns in the table.\r
if (r > 0) {\r
\r
// Set what's in the columns.\r
\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 col2Text = index.swapPairEntries ? pair.lang1 : pair.lang2;\r
col2.setOnLongClickListener(textViewLongClickListenerIndex1);\r
}\r
\r
- // Because we have a Button inside a ListView row:\r
- // http://groups.google.com/group/android-developers/browse_thread/thread/3d96af1530a7d62a?pli=1\r
- result.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);\r
- result.setClickable(true);\r
- result.setFocusable(true);\r
- result.setLongClickable(true);\r
- result.setBackgroundResource(android.R.drawable.menuitem_background);\r
- result.setOnClickListener(new TextView.OnClickListener() {\r
- @Override\r
- public void onClick(View v) {\r
- DictionaryActivity.this.onListItemClick(null, v, position, position);\r
- }\r
- });\r
- \r
result.addView(tableRow);\r
}\r
\r
- return result;\r
+ // Because we have a Button inside a ListView row:\r
+ // http://groups.google.com/group/android-developers/browse_thread/thread/3d96af1530a7d62a?pli=1\r
+ result.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);\r
+ result.setClickable(true);\r
+ result.setFocusable(true);\r
+ result.setLongClickable(true);\r
+ result.setBackgroundResource(android.R.drawable.menuitem_background);\r
+ result.setOnClickListener(new TextView.OnClickListener() {\r
+ @Override\r
+ public void onClick(View v) {\r
+ DictionaryActivity.this.onListItemClick(getListView(), v, position, position);\r
+ }\r
+ });\r
\r
- \r
-// final WebView result = (WebView) (convertView instanceof WebView ? convertView : new WebView(parent.getContext()));\r
-// \r
-// final PairEntry entry = row.getEntry();\r
-// final int rowCount = entry.pairs.size();\r
-// final StringBuilder html = new StringBuilder();\r
-// html.append("<html><body><table width=\"100%\">");\r
-// for (int r = 0; r < rowCount; ++r) {\r
-// html.append("<tr>");\r
-//\r
-// final Pair pair = entry.pairs.get(r);\r
-// // TODO: escape both the token and the text.\r
-// final String token = row.getTokenRow(true).getToken();\r
-// final String col1Text = index.swapPairEntries ? pair.lang2 : pair.lang1;\r
-// final String col2Text = index.swapPairEntries ? pair.lang1 : pair.lang2;\r
-// \r
-// col1Text.replaceAll(token, String.format("<b>%s</b>", token));\r
-//\r
-// // Column1\r
-// html.append("<td width=\"50%\">");\r
-// if (r > 0) {\r
-// html.append("<li>");\r
-// }\r
-// html.append(col1Text);\r
-// html.append("</td>");\r
-//\r
-// // Column2\r
-// html.append("<td width=\"50%\">");\r
-// if (r > 0) {\r
-// html.append("<li>");\r
-// }\r
-// html.append(col2Text);\r
-// html.append("</td>");\r
-//\r
-//// column1.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);\r
-//// column2.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);\r
-//\r
-// html.append("</tr>");\r
-// }\r
-// html.append("</table></body></html>");\r
-// \r
-// Log.i(LOG, html.toString());\r
-// \r
-// result.getSettings().setRenderPriority(RenderPriority.HIGH);\r
-// result.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);\r
-// \r
-// result.loadData("<html><body><table><tr><td>line (connected series of public conveyances, and hence, an established arrangement for forwarding merchandise, etc.) (noun)</td><td>verbinding</td></tr></table></body></html>", "text/html", "utf-8");\r
-//\r
-// return result;\r
+ return result;\r
}\r
\r
- private View getView(TokenRow row, ViewGroup parent, final View convertView) {\r
+ private TableLayout getView(TokenRow row, ViewGroup parent, final TableLayout result) {\r
final Context context = parent.getContext();\r
final TextView textView = new TextView(context);\r
textView.setText(row.getToken());\r
- textView.setBackgroundResource(row.hasMainEntry ? theme.tokenRowMainBg : theme.tokenRowOtherBg);\r
// Doesn't work:\r
//textView.setTextColor(android.R.color.secondary_text_light);\r
textView.setTextAppearance(context, theme.tokenRowFg);\r
textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 5 * fontSizeSp / 4);\r
- return textView;\r
+ \r
+ final TableRow tableRow = new TableRow(result.getContext());\r
+ tableRow.addView(textView);\r
+ tableRow.setBackgroundResource(row.hasMainEntry ? theme.tokenRowMainBg : theme.tokenRowOtherBg);\r
+ result.addView(tableRow);\r
+ return result;\r
}\r
\r
}\r
final Dialog dialog = new Dialog(getListView().getContext());\r
dialog.setContentView(R.layout.thadolina_dialog);\r
dialog.setTitle("Ti amo, amore mio!");\r
+ final ImageView imageView = (ImageView) dialog.findViewById(R.id.thadolina_image);\r
+ imageView.setOnClickListener(new OnClickListener() {\r
+ @Override\r
+ public void onClick(View v) {\r
+ final Intent intent = new Intent(Intent.ACTION_VIEW);\r
+ intent.setData(Uri.parse("https://sites.google.com/site/cfoxroxvday/vday2012"));\r
+ startActivity(intent);\r
+ }\r
+ });\r
dialog.show();\r
}\r
if (dictRaf == null) {\r