package com.hughes.android.dictionary;\r
\r
import java.io.File;\r
+import java.io.FileWriter;\r
+import java.io.IOException;\r
+import java.io.PrintWriter;\r
import java.io.RandomAccessFile;\r
+import java.text.SimpleDateFormat;\r
+import java.util.Date;\r
import java.util.concurrent.Executor;\r
import java.util.concurrent.Executors;\r
import java.util.concurrent.atomic.AtomicBoolean;\r
import android.os.Handler;\r
import android.os.Vibrator;\r
import android.preference.PreferenceManager;\r
+import android.text.ClipboardManager;\r
import android.text.Editable;\r
import android.text.Spannable;\r
import android.text.TextWatcher;\r
import android.text.style.StyleSpan;\r
import android.util.Log;\r
+import android.view.ContextMenu;\r
+import android.view.KeyEvent;\r
+import android.view.Menu;\r
+import android.view.MenuItem;\r
import android.view.View;\r
import android.view.ViewGroup;\r
+import android.view.ContextMenu.ContextMenuInfo;\r
+import android.view.MenuItem.OnMenuItemClickListener;\r
import android.view.View.OnClickListener;\r
import android.view.inputmethod.InputMethodManager;\r
+import android.widget.AdapterView;\r
import android.widget.BaseAdapter;\r
import android.widget.Button;\r
import android.widget.EditText;\r
import android.widget.ListAdapter;\r
+import android.widget.ListView;\r
import android.widget.TableLayout;\r
import android.widget.TableRow;\r
import android.widget.TextView;\r
+import android.widget.Toast;\r
+import android.widget.AdapterView.AdapterContextMenuInfo;\r
\r
import com.hughes.android.dictionary.engine.Dictionary;\r
import com.hughes.android.dictionary.engine.Index;\r
\r
static final int VIBRATE_MILLIS = 100;\r
\r
+ int dictIndex = 0;\r
RandomAccessFile dictRaf = null;\r
Dictionary dictionary = null;\r
int indexIndex = 0;\r
public DictionaryActivity() {\r
}\r
\r
- public static Intent getIntent(final int dictIndex, final int indexIndex, final String searchToken) {\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
- intent.putExtra(C.DICT_INDEX, dictIndex);\r
- intent.putExtra(C.INDEX_INDEX, indexIndex);\r
- intent.putExtra(C.SEARCH_TOKEN, searchToken);\r
return intent;\r
}\r
\r
+ public static void setDictionaryPrefs(final Context context,\r
+ final int dictIndex, final int indexIndex, final String searchToken) {\r
+ final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(context).edit();\r
+ prefs.putInt(C.DICT_INDEX, dictIndex);\r
+ prefs.putInt(C.INDEX_INDEX, indexIndex);\r
+ prefs.putString(C.SEARCH_TOKEN, searchToken);\r
+ prefs.commit();\r
+ }\r
+\r
+ public static void clearDictionaryPrefs(final Context context) {\r
+ final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(context).edit();\r
+ prefs.remove(C.DICT_INDEX);\r
+ prefs.remove(C.INDEX_INDEX);\r
+ prefs.remove(C.SEARCH_TOKEN);\r
+ prefs.commit();\r
+ }\r
+\r
@Override\r
public void onCreate(Bundle savedInstanceState) {\r
super.onCreate(savedInstanceState);\r
\r
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);\r
\r
- PersistentObjectCache.init(this);\r
- QuickDicConfig quickDicConfig = PersistentObjectCache.init(\r
- this).read(C.DICTIONARY_CONFIGS, QuickDicConfig.class);\r
- \r
- final Intent intent = getIntent();\r
- \r
- final int dictIndex = intent.getIntExtra(C.DICT_INDEX, 0);\r
try {\r
+ PersistentObjectCache.init(this);\r
+ 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
dictRaf = new RandomAccessFile(dictionaryConfig.localFile, "r");\r
dictionary = new Dictionary(dictRaf); \r
} catch (Exception e) {\r
Log.e(LOG, "Unable to load dictionary.", e);\r
- DictionaryEditActivity.getIntent(dictIndex);\r
+ Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()), Toast.LENGTH_LONG);\r
+ startActivity(DictionaryEditActivity.getIntent(dictIndex));\r
finish();\r
return;\r
}\r
public void run() {\r
final long startMillis = System.currentTimeMillis();\r
for (final Index index : dictionary.indices) {\r
- index.sortLanguage.getFindCollator();\r
- final com.ibm.icu.text.Collator c = index.sortLanguage\r
- .getSortCollator();\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
}\r
});\r
\r
- indexIndex = intent.getIntExtra(C.INDEX_INDEX, 0) % dictionary.indices.size();\r
+ indexIndex = prefs.getInt(C.INDEX_INDEX, 0) % dictionary.indices.size();\r
index = dictionary.indices.get(indexIndex);\r
setListAdapter(new IndexAdapter(index));\r
\r
searchText = (EditText) findViewById(R.id.SearchText);\r
langButton = (Button) findViewById(R.id.LangButton);\r
\r
+ searchText.requestFocus();\r
searchText.addTextChangedListener(new SearchTextWatcher());\r
- \r
+ searchText.setText(prefs.getString(C.SEARCH_TOKEN, ""));\r
+ Log.d(LOG, "Trying to restore searchText=" + searchText.getText());\r
\r
final Button clearSearchTextButton = (Button) findViewById(R.id.ClearSearchTextButton);\r
clearSearchTextButton.setOnClickListener(new OnClickListener() {\r
onLanguageButton();\r
}\r
});\r
+ updateLangButton();\r
\r
final Button upButton = (Button) findViewById(R.id.UpButton);\r
upButton.setOnClickListener(new OnClickListener() {\r
}\r
});\r
\r
+ getListView().setOnItemSelectedListener(new ListView.OnItemSelectedListener() {\r
+ @Override\r
+ public void onItemSelected(AdapterView<?> adapterView, View arg1, final int position,\r
+ long id) {\r
+ if (!searchText.isFocused()) {\r
+ // TODO: don't do this if multi words are entered.\r
+ final RowBase row = (RowBase) getListAdapter().getItem(position);\r
+ final TokenRow tokenRow = row.getTokenRow(true);\r
+ searchText.setText(tokenRow.getToken());\r
+ }\r
+ }\r
+\r
+ @Override\r
+ public void onNothingSelected(AdapterView<?> arg0) {\r
+ }\r
+ });\r
+\r
// ContextMenu.\r
registerForContextMenu(getListView());\r
- \r
+\r
+ // Prefs.\r
+ wordList = new File(prefs.getString(getString(R.string.wordListFileKey),\r
+ getString(R.string.wordListFileDefault)));\r
+ saveOnlyFirstSubentry = prefs.getBoolean(getString(R.string.saveOnlyFirstSubentryKey), false);\r
if (prefs.getBoolean(getString(R.string.vibrateOnFailedSearchKey), true)) {\r
vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);\r
}\r
+ Log.d(LOG, "wordList=" + wordList + ", saveOnlyFirstSubentry=" + saveOnlyFirstSubentry);\r
+ }\r
+ \r
+ \r
+ @Override\r
+ protected void onResume() {\r
+ super.onResume();\r
+ }\r
\r
- updateLangButton();\r
+ @Override\r
+ protected void onPause() {\r
+ super.onPause();\r
+ }\r
\r
+ @Override\r
+ protected void onDestroy() {\r
+ super.onDestroy();\r
+ setDictionaryPrefs(this, dictIndex, indexIndex, searchText.getText().toString());\r
+ try {\r
+ dictRaf.close();\r
+ } catch (IOException e) {\r
+ Log.e(LOG, "Failed to close dictionary", e);\r
+ }\r
}\r
\r
// --------------------------------------------------------------------------\r
destIndexEntry = Math.min(tokenRow.referenceIndex + 1, index.sortedIndexEntries.size());\r
}\r
\r
- Log.d(LOG, "onUpDownButton, destIndexEntry=" + destIndexEntry);\r
- jumpToRow(index.sortedIndexEntries.get(destIndexEntry).startRow);\r
+ final Index.IndexEntry dest = index.sortedIndexEntries.get(destIndexEntry);\r
+ searchText.setText(dest.token);\r
+ Log.d(LOG, "onUpDownButton, destIndexEntry=" + dest.token);\r
+ //jumpToRow(index.sortedIndexEntries.get(destIndexEntry).startRow);\r
+ }\r
+\r
+ // --------------------------------------------------------------------------\r
+ // Options Menu\r
+ // --------------------------------------------------------------------------\r
+ \r
+ @Override\r
+ public boolean onCreateOptionsMenu(final Menu menu) {\r
+ \r
+ {\r
+ final MenuItem preferences = menu.add(getString(R.string.preferences));\r
+ preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
+ public boolean onMenuItemClick(final MenuItem menuItem) {\r
+ startActivity(new Intent(DictionaryActivity.this,\r
+ PreferenceActivity.class));\r
+ return false;\r
+ }\r
+ });\r
+ }\r
+\r
+ {\r
+ 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(DictionaryListActivity.getIntent(DictionaryActivity.this));\r
+ return false;\r
+ }\r
+ });\r
+ }\r
+\r
+ {\r
+ final MenuItem dictionaryList = menu.add(getString(R.string.editDictionary));\r
+ dictionaryList.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
+ public boolean onMenuItemClick(final MenuItem menuItem) {\r
+ final Intent intent = DictionaryEditActivity.getIntent(dictIndex);\r
+ startActivity(intent);\r
+ return false;\r
+ }\r
+ });\r
+ }\r
+\r
+ return true;\r
}\r
\r
+\r
// --------------------------------------------------------------------------\r
- // Menu\r
+ // Context Menu + clicks\r
// --------------------------------------------------------------------------\r
\r
+ @Override\r
+ public void onCreateContextMenu(ContextMenu menu, View v,\r
+ ContextMenuInfo menuInfo) {\r
+ AdapterContextMenuInfo adapterContextMenuInfo = (AdapterContextMenuInfo) menuInfo;\r
+ final RowBase row = (RowBase) getListAdapter().getItem(adapterContextMenuInfo.position);\r
+\r
+ final MenuItem addToWordlist = menu.add(getString(R.string.addToWordList, wordList.getName()));\r
+ addToWordlist.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
+ public boolean onMenuItemClick(MenuItem item) {\r
+ onAppendToWordList(row);\r
+ return false;\r
+ }\r
+ });\r
+\r
+ final MenuItem copy = menu.add(android.R.string.copy);\r
+ copy.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
+ public boolean onMenuItemClick(MenuItem item) {\r
+ onCopy(row);\r
+ return false;\r
+ }\r
+ });\r
+\r
+ }\r
+ \r
+ @Override\r
+ protected void onListItemClick(ListView l, View v, int row, long id) {\r
+ openContextMenu(v);\r
+ }\r
+ \r
+ void onAppendToWordList(final RowBase row) {\r
+ final StringBuilder rawText = new StringBuilder();\r
+ rawText.append(\r
+ new SimpleDateFormat("yyyy.MM.dd HH:mm:ss").format(new Date()))\r
+ .append("\t");\r
+ rawText.append(index.longName).append("\t");\r
+ rawText.append(row.getTokenRow(true).getToken()).append("\t");\r
+ rawText.append(row.getRawText(saveOnlyFirstSubentry));\r
+ Log.d(LOG, "Writing : " + rawText);\r
+ try {\r
+ wordList.getParentFile().mkdirs();\r
+ final PrintWriter out = new PrintWriter(\r
+ new FileWriter(wordList, true));\r
+ out.println(rawText.toString());\r
+ out.close();\r
+ } catch (IOException e) {\r
+ Log.e(LOG, "Unable to append to " + wordList.getAbsolutePath(), e);\r
+ Toast.makeText(this, getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()), Toast.LENGTH_LONG);\r
+ }\r
+ return;\r
+ }\r
+\r
+ void onCopy(final RowBase row) {\r
+ Log.d(LOG, "Copy, row=" + row);\r
+ final StringBuilder result = new StringBuilder();\r
+ result.append(row.getRawText(false));\r
+ final ClipboardManager clipboardManager = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);\r
+ clipboardManager.setText(result.toString());\r
+ Log.d(LOG, "Copied: " + result);\r
+ }\r
+\r
+ @Override\r
+ public boolean onKeyDown(final int keyCode, final KeyEvent event) {\r
+ if (event.getUnicodeChar() != 0) {\r
+ if (!searchText.hasFocus()) {\r
+ searchText.setText("" + (char) event.getUnicodeChar());\r
+ onSearchTextChange(searchText.getText().toString());\r
+ searchText.requestFocus();\r
+ }\r
+ return true;\r
+ }\r
+ return super.onKeyDown(keyCode, event);\r
+ }\r
+\r
+\r
// --------------------------------------------------------------------------\r
// SearchOperation\r
// --------------------------------------------------------------------------\r
\r
private void searchFinished(final SearchOperation searchOperation) {\r
+ if (searchOperation.interrupted.get()) {\r
+ Log.d(LOG, "Search operation was interrupted: " + searchOperation);\r
+ return;\r
+ }\r
if (searchOperation != this.currentSearchOperation) {\r
+ Log.d(LOG, "Stale searchOperation finished: " + searchOperation);\r
return;\r
}\r
\r
- final Index.SearchResult searchResult = searchOperation.searchResult;\r
- Log.d(LOG, "searchFinished, " + searchResult.longestPrefixString + ", success=" + searchResult.success);\r
+ final Index.IndexEntry searchResult = searchOperation.searchResult;\r
+ Log.d(LOG, "searchFinished: " + searchOperation + ", searchResult=" + searchResult);\r
\r
jumpToRow(searchResult.longestPrefix.startRow);\r
\r
- if (!searchResult.success) {\r
- if (vibrator != null) {\r
- vibrator.vibrate(VIBRATE_MILLIS);\r
- }\r
- searchText.setText(searchResult.longestPrefixString);\r
- searchText.setSelection(searchResult.longestPrefixString.length());\r
- return;\r
- }\r
+// if (!searchResult.success) {\r
+// if (vibrator != null) {\r
+// vibrator.vibrate(VIBRATE_MILLIS);\r
+// }\r
+// searchText.setText(searchResult.longestPrefixString);\r
+// searchText.setSelection(searchResult.longestPrefixString.length());\r
+// return;\r
+// }\r
}\r
\r
private final void jumpToRow(final int row) {\r
\r
long searchStartMillis;\r
\r
- Index.SearchResult searchResult;\r
+ Index.IndexEntry searchResult;\r
\r
SearchOperation(final String searchText, final Index index) {\r
this.searchText = searchText.trim();\r
this.index = index;\r
}\r
+ \r
+ public String toString() {\r
+ return String.format("SearchOperation(%s,%s)", searchText, interrupted.toString());\r
+ }\r
\r
@Override\r
public void run() {\r
searchStartMillis = System.currentTimeMillis();\r
- searchResult = index.findLongestSubstring(searchText, interrupted);\r
+ searchResult = index.findInsertionPoint(searchText, interrupted);\r
Log.d(LOG, "searchText=" + searchText + ", searchDuration="\r
+ (System.currentTimeMillis() - searchStartMillis) + ", interrupted="\r
+ interrupted.get());\r
}\r
\r
@Override\r
- public Object getItem(int position) {\r
+ public RowBase getItem(int position) {\r
return index.rows.get(position);\r
}\r
\r
@Override\r
public long getItemId(int position) {\r
- return position;\r
+ return getItem(position).index();\r
}\r
\r
@Override\r
// SearchText\r
// --------------------------------------------------------------------------\r
\r
- void onSearchTextChange(final String searchText) {\r
- Log.d(LOG, "onSearchTextChange: " + searchText);\r
+ void onSearchTextChange(final String text) {\r
+ if (!searchText.isFocused()) {\r
+ return;\r
+ }\r
+ Log.d(LOG, "onSearchTextChange: " + text); \r
if (currentSearchOperation != null) {\r
+ Log.d(LOG, "Interrupting currentSearchOperation.");\r
currentSearchOperation.interrupted.set(true);\r
}\r
- currentSearchOperation = new SearchOperation(searchText, index);\r
+ currentSearchOperation = new SearchOperation(text, index);\r
searchExecutor.execute(currentSearchOperation);\r
}\r
\r
private class SearchTextWatcher implements TextWatcher {\r
public void afterTextChanged(final Editable searchTextEditable) {\r
- Log.d(LOG, "Search text changed: " + searchText.getText());\r
if (searchText.hasFocus()) {\r
+ Log.d(LOG, "Search text changed with focus: " + searchText.getText());\r
// If they were typing to cause the change, update the UI.\r
onSearchTextChange(searchText.getText().toString());\r
}\r