package com.hughes.android.dictionary;\r
\r
import java.io.File;\r
-import java.io.IOException;\r
import java.io.RandomAccessFile;\r
import java.util.concurrent.Executor;\r
import java.util.concurrent.Executors;\r
import java.util.concurrent.atomic.AtomicBoolean;\r
\r
import android.app.ListActivity;\r
+import android.content.Context;\r
import android.content.Intent;\r
+import android.content.SharedPreferences;\r
import android.graphics.Typeface;\r
import android.os.Bundle;\r
import android.os.Handler;\r
+import android.os.Vibrator;\r
import android.preference.PreferenceManager;\r
import android.text.Editable;\r
import android.text.Spannable;\r
import android.view.View;\r
import android.view.ViewGroup;\r
import android.view.View.OnClickListener;\r
+import android.view.inputmethod.InputMethodManager;\r
import android.widget.BaseAdapter;\r
import android.widget.Button;\r
import android.widget.EditText;\r
public class DictionaryActivity extends ListActivity {\r
\r
static final String LOG = "QuickDic";\r
+ \r
+ static final int VIBRATE_MILLIS = 100;\r
\r
RandomAccessFile dictRaf = null;\r
Dictionary dictionary = null;\r
// Visible for testing.\r
ListAdapter indexAdapter = null;\r
\r
+ private Vibrator vibrator = null;\r
+ \r
+ public DictionaryActivity() {\r
+ }\r
\r
public static Intent getIntent(final int dictIndex, final int indexIndex, final String searchToken) {\r
final Intent intent = new Intent();\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 DictionaryConfig dictionaryConfig = quickDicConfig.dictionaryConfigs.get(intent.getIntExtra(C.DICT_INDEX, 0));\r
+ final int dictIndex = intent.getIntExtra(C.DICT_INDEX, 0);\r
try {\r
+ final DictionaryConfig dictionaryConfig = quickDicConfig.dictionaryConfigs.get(dictIndex);\r
dictRaf = new RandomAccessFile(dictionaryConfig.localFile, "r");\r
dictionary = new Dictionary(dictRaf); \r
- } catch (IOException e) {\r
+ } catch (Exception e) {\r
Log.e(LOG, "Unable to load dictionary.", e);\r
- // TODO: Start up the editor.\r
+ DictionaryEditActivity.getIntent(dictIndex);\r
finish();\r
return;\r
}\r
+\r
+ // Pre-load the collators.\r
+ searchExecutor.execute(new Runnable() {\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
+ if (c.compare("pre-print", "preppy") >= 0) {\r
+ Log.e(LOG, c.getClass()\r
+ + " is buggy, lookups may not work properly.");\r
+ }\r
+ }\r
+ Log.d(LOG, "Loading collators took:"\r
+ + (System.currentTimeMillis() - startMillis));\r
+ }\r
+ });\r
\r
- indexIndex = intent.getIntExtra(C.INDEX_INDEX, 0);\r
+ indexIndex = intent.getIntExtra(C.INDEX_INDEX, 0) % dictionary.indices.size();\r
index = dictionary.indices.get(indexIndex);\r
setListAdapter(new IndexAdapter(index));\r
\r
final Button clearSearchTextButton = (Button) findViewById(R.id.ClearSearchTextButton);\r
clearSearchTextButton.setOnClickListener(new OnClickListener() {\r
public void onClick(View v) {\r
- //onClearSearchTextButton(clearSearchTextButton);\r
+ onClearSearchTextButton(clearSearchTextButton);\r
}\r
});\r
clearSearchTextButton.setVisibility(PreferenceManager.getDefaultSharedPreferences(this).getBoolean(\r
final Button upButton = (Button) findViewById(R.id.UpButton);\r
upButton.setOnClickListener(new OnClickListener() {\r
public void onClick(View v) {\r
- //onUpButton();\r
+ onUpDownButton(true);\r
}\r
});\r
final Button downButton = (Button) findViewById(R.id.DownButton);\r
downButton.setOnClickListener(new OnClickListener() {\r
public void onClick(View v) {\r
- //onDownButton();\r
+ onUpDownButton(false);\r
}\r
});\r
\r
// ContextMenu.\r
registerForContextMenu(getListView());\r
+ \r
+ if (prefs.getBoolean(getString(R.string.vibrateOnFailedSearchKey), true)) {\r
+ vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);\r
+ }\r
\r
updateLangButton();\r
\r
}\r
+\r
+ // --------------------------------------------------------------------------\r
+ // Buttons\r
+ // --------------------------------------------------------------------------\r
+\r
+ private void onClearSearchTextButton(final Button clearSearchTextButton) {\r
+ clearSearchTextButton.requestFocus();\r
+ searchText.setText("");\r
+ searchText.requestFocus();\r
+ Log.d(LOG, "Trying to show soft keyboard.");\r
+ final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);\r
+ manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT);\r
+ }\r
\r
void updateLangButton() {\r
langButton.setText(index.shortName.toUpperCase());\r
}\r
\r
-\r
- \r
- \r
void onLanguageButton() {\r
- // TODO: synchronized, stop search.\r
+ if (currentSearchOperation != null) {\r
+ currentSearchOperation.interrupted.set(true);\r
+ currentSearchOperation = null;\r
+ }\r
\r
indexIndex = (indexIndex + 1) % dictionary.indices.size();\r
index = dictionary.indices.get(indexIndex);\r
onSearchTextChange(searchText.getText().toString());\r
}\r
\r
+ void onUpDownButton(final boolean up) {\r
+ final int firstVisibleRow = getListView().getFirstVisiblePosition();\r
+ final RowBase row = index.rows.get(firstVisibleRow);\r
+ final TokenRow tokenRow = row.getTokenRow(true);\r
+ final int destIndexEntry;\r
+ if (up) {\r
+ if (row != tokenRow) {\r
+ destIndexEntry = tokenRow.referenceIndex;\r
+ } else {\r
+ destIndexEntry = Math.max(tokenRow.referenceIndex - 1, 0);\r
+ }\r
+ } else {\r
+ // Down\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
+ }\r
+\r
+ // --------------------------------------------------------------------------\r
+ // Menu\r
+ // --------------------------------------------------------------------------\r
+\r
// --------------------------------------------------------------------------\r
// SearchOperation\r
// --------------------------------------------------------------------------\r
\r
private void searchFinished(final SearchOperation searchOperation) {\r
- if (searchOperation == this.currentSearchOperation) {\r
- setSelection(searchOperation.tokenRow.index());\r
- getListView().setSelected(true);\r
+ if (searchOperation != this.currentSearchOperation) {\r
+ return;\r
+ }\r
+ \r
+ final Index.SearchResult searchResult = searchOperation.searchResult;\r
+ Log.d(LOG, "searchFinished, " + searchResult.longestPrefixString + ", success=" + searchResult.success);\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
}\r
+ \r
+ private final void jumpToRow(final int row) {\r
+ setSelection(row);\r
+ getListView().setSelected(true);\r
+ }\r
\r
final class SearchOperation implements Runnable {\r
\r
final String searchText;\r
final Index index;\r
\r
- boolean failed = false;\r
- TokenRow tokenRow;\r
+ long searchStartMillis;\r
+\r
+ Index.SearchResult searchResult;\r
\r
SearchOperation(final String searchText, final Index index) {\r
this.searchText = searchText.trim();\r
\r
@Override\r
public void run() {\r
- tokenRow = index.findInsertionPoint(searchText, interrupted);\r
- failed = false; // TODO\r
+ searchStartMillis = System.currentTimeMillis();\r
+ searchResult = index.findLongestSubstring(searchText, interrupted);\r
+ Log.d(LOG, "searchText=" + searchText + ", searchDuration="\r
+ + (System.currentTimeMillis() - searchStartMillis) + ", interrupted="\r
+ + interrupted.get());\r
if (!interrupted.get()) {\r
uiHandler.post(new Runnable() {\r
@Override\r
}
}
- static final class IndexEntry implements RAFSerializable<Index.IndexEntry> {
- String token;
- int startRow;
+ public static final class IndexEntry implements RAFSerializable<Index.IndexEntry> {
+ public final String token;
+ public final int startRow;
static final RAFSerializer<IndexEntry> SERIALIZER = new RAFSerializer<IndexEntry> () {
@Override
}
public static final class SearchResult {
- final IndexEntry insertionPoint;
- final IndexEntry longestPrefix;
- final String longestPrefixString;
+ public final IndexEntry insertionPoint;
+ public final IndexEntry longestPrefix;
+ public final String longestPrefixString;
+ public final boolean success;
public SearchResult(IndexEntry insertionPoint, IndexEntry longestPrefix,
- String longestPrefixString) {
+ String longestPrefixString, boolean success) {
this.insertionPoint = insertionPoint;
this.longestPrefix = longestPrefix;
this.longestPrefixString = longestPrefixString;
+ this.success = success;
}
}
public SearchResult findLongestSubstring(String token, final AtomicBoolean interrupted) {
+ if (token.length() == 0) {
+ return new SearchResult(sortedIndexEntries.get(0), sortedIndexEntries.get(0), "", true);
+ }
IndexEntry insertionPoint = null;
IndexEntry result = null;
+ boolean unmodified = true;
while (!interrupted.get() && token.length() > 0) {
result = findInsertionPoint(token, interrupted);
if (result == null) {
return null;
}
- if (insertionPoint == null) {
+ if (unmodified) {
insertionPoint = result;
}
if (sortLanguage.textNorm(result.token, true).startsWith(sortLanguage.textNorm(token, true))) {
- return new SearchResult(insertionPoint, result, token);
+ return new SearchResult(insertionPoint, result, token, unmodified);
}
+ unmodified = false;
token = token.substring(0, token.length() - 1);
}
- return new SearchResult(insertionPoint, sortedIndexEntries.get(0), "");
+ return new SearchResult(insertionPoint, sortedIndexEntries.get(0), "", false);
}
private final int windBackCase(final String token, int result, final Collator sortCollator, final AtomicBoolean interrupted) {
projects / Dictionary.git / commitdiff