import java.io.PrintWriter;\r
import java.io.RandomAccessFile;\r
import java.text.SimpleDateFormat;\r
+import java.util.Arrays;\r
+import java.util.Collections;\r
import java.util.Date;\r
+import java.util.LinkedHashSet;\r
+import java.util.List;\r
+import java.util.Set;\r
import java.util.concurrent.Executor;\r
import java.util.concurrent.Executors;\r
import java.util.concurrent.ThreadFactory;\r
import java.util.concurrent.atomic.AtomicBoolean;\r
+import java.util.regex.Matcher;\r
+import java.util.regex.Pattern;\r
\r
+import android.app.Dialog;\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.net.Uri;\r
import android.os.Bundle;\r
import android.os.Handler;\r
import android.preference.PreferenceManager;\r
import android.text.ClipboardManager;\r
import android.text.Editable;\r
+import android.text.Selection;\r
import android.text.Spannable;\r
import android.text.TextWatcher;\r
+import android.text.method.LinkMovementMethod;\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
import android.view.Menu;\r
import android.view.MenuItem;\r
import android.view.MenuItem.OnMenuItemClickListener;\r
+import android.view.MotionEvent;\r
import android.view.View;\r
import android.view.View.OnClickListener;\r
+import android.view.View.OnLongClickListener;\r
import android.view.ViewGroup;\r
+import android.view.WindowManager;\r
import android.view.inputmethod.InputMethodManager;\r
import android.widget.AdapterView;\r
import android.widget.AdapterView.AdapterContextMenuInfo;\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 android.widget.TableLayout;\r
import android.widget.TextView;\r
import android.widget.Toast;\r
\r
+import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;\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.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
import com.hughes.android.dictionary.engine.TransliteratorManager;\r
-import com.hughes.android.util.PersistentObjectCache;\r
+import com.hughes.android.util.IntentLauncher;\r
+import com.hughes.android.util.NonLinkClickableSpan;\r
\r
public class DictionaryActivity extends ListActivity {\r
\r
static final String LOG = "QuickDic";\r
- \r
- static final int VIBRATE_MILLIS = 100;\r
\r
- int dictIndex = 0;\r
+ private String initialSearchText;\r
+\r
+ DictionaryApplication application;\r
+ File dictFile = null;\r
RandomAccessFile dictRaf = null;\r
Dictionary dictionary = null;\r
int indexIndex = 0;\r
Index index = null;\r
+ List<RowBase> rowsToShow = null; // if not null, just show these rows.\r
\r
// package for test.\r
final Handler uiHandler = new Handler();\r
});\r
private SearchOperation currentSearchOperation = null;\r
\r
+ C.Theme theme = C.Theme.LIGHT;\r
+ int fontSizeSp;\r
EditText searchText;\r
Button langButton;\r
\r
// Never null.\r
private File wordList = null;\r
private boolean saveOnlyFirstSubentry = false;\r
+ private boolean clickOpensContextMenu = false;\r
\r
// Visible for testing.\r
ListAdapter indexAdapter = null;\r
\r
final SearchTextWatcher searchTextWatcher = new SearchTextWatcher();\r
-\r
- //private Vibrator vibrator = null;\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
}\r
\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
+ public static Intent getLaunchIntent(final File dictFile, final int indexIndex, final String searchToken) {\r
final Intent intent = new Intent();\r
intent.setClassName(DictionaryActivity.class.getPackage().getName(), DictionaryActivity.class.getName());\r
+ intent.putExtra(C.DICT_FILE, dictFile.getPath());\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
+ @Override\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
- 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
- Log.d(LOG, "Removed default dictionary prefs.");\r
+ @Override\r
+ protected void onRestoreInstanceState(final Bundle outState) {\r
+ super.onRestoreInstanceState(outState);\r
+ Log.d(LOG, "onRestoreInstanceState: " + outState.getString(C.SEARCH_TOKEN));\r
+ onCreate(outState);\r
}\r
\r
@Override\r
- public void onCreate(Bundle savedInstanceState) {\r
- ((DictionaryApplication)getApplication()).applyTheme(this);\r
- \r
- super.onCreate(savedInstanceState);\r
+ public void onCreate(Bundle savedInstanceState) { \r
+ setTheme(((DictionaryApplication)getApplication()).getSelectedTheme().themeId);\r
+\r
Log.d(LOG, "onCreate:" + this);\r
+ super.onCreate(savedInstanceState);\r
+\r
+ application = (DictionaryApplication) getApplication();\r
+ theme = application.getSelectedTheme();\r
+\r
+ // Clear them so that if something goes wrong, we won't relaunch.\r
+ clearDictionaryPrefs(this);\r
\r
- final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);\r
+ final Intent intent = getIntent();\r
+ dictFile = new File(intent.getStringExtra(C.DICT_FILE));\r
\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
- this.setTitle("QuickDic: " + dictionaryConfig.name);\r
- dictRaf = new RandomAccessFile(dictionaryConfig.localFile, "r");\r
+ final String name = application.getDictionaryName(dictFile.getName());\r
+ this.setTitle("QuickDic: " + name);\r
+ dictRaf = new RandomAccessFile(dictFile, "r");\r
dictionary = new Dictionary(dictRaf); \r
} catch (Exception e) {\r
Log.e(LOG, "Unable to load dictionary.", e);\r
}\r
dictRaf = null;\r
}\r
- Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()), Toast.LENGTH_LONG);\r
- startActivity(DictionaryEditActivity.getIntent(dictIndex));\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 = prefs.getInt(C.INDEX_INDEX, 0) % dictionary.indices.size();\r
- Log.d(LOG, "Loading index.");\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
+ \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.getSymbol());\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
+ final String fontSize = prefs.getString(getString(R.string.fontSizeKey), "14");\r
+ try {\r
+ fontSizeSp = Integer.parseInt(fontSize.trim());\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
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
onLanguageButton();\r
}\r
});\r
+ langButton.setOnLongClickListener(new OnLongClickListener() {\r
+ @Override\r
+ public boolean onLongClick(View v) {\r
+ onLanguageButtonLongClick(v.getContext());\r
+ return true;\r
+ }\r
+ });\r
updateLangButton();\r
\r
final Button upButton = (Button) findViewById(R.id.UpButton);\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
- Log.d(LOG, "onItemSelected: " + row.index());\r
- final TokenRow tokenRow = row.getTokenRow(true);\r
- searchText.setText(tokenRow.getToken());\r
+ if (!isFiltered()) {\r
+ final RowBase row = (RowBase) getListAdapter().getItem(position);\r
+ Log.d(LOG, "onItemSelected: " + row.index());\r
+ final TokenRow tokenRow = row.getTokenRow(true);\r
+ searchText.setText(tokenRow.getToken());\r
+ }\r
}\r
}\r
\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
+ clickOpensContextMenu = prefs.getBoolean(getString(R.string.clickOpensContextMenuKey), 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
+ setDictionaryPrefs(this, dictFile, indexIndex, searchText.getText().toString());\r
}\r
\r
@Override\r
protected void onResume() {\r
super.onResume();\r
+ if (PreferenceActivity.prefsMightHaveChanged) {\r
+ PreferenceActivity.prefsMightHaveChanged = false;\r
+ finish();\r
+ startActivity(getIntent());\r
+ }\r
+ if (initialSearchText != null) {\r
+ setSearchText(initialSearchText, true);\r
+ }\r
}\r
\r
@Override\r
protected void onPause() {\r
super.onPause();\r
}\r
+ \r
+ private static void setDictionaryPrefs(final Context context,\r
+ final File dictFile, final int indexIndex, final String searchToken) {\r
+ final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(context).edit();\r
+ prefs.putString(C.DICT_FILE, dictFile.getPath());\r
+ prefs.putInt(C.INDEX_INDEX, indexIndex);\r
+ prefs.putString(C.SEARCH_TOKEN, searchToken);\r
+ prefs.commit();\r
+ }\r
+\r
+ private static void clearDictionaryPrefs(final Context context) {\r
+ final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(context).edit();\r
+ prefs.remove(C.DICT_FILE);\r
+ prefs.remove(C.INDEX_INDEX);\r
+ prefs.remove(C.SEARCH_TOKEN);\r
+ prefs.commit();\r
+ }\r
+\r
\r
@Override\r
protected void onDestroy() {\r
if (dictRaf == null) {\r
return;\r
}\r
- setDictionaryPrefs(this, dictIndex, indexIndex, searchText.getText().toString());\r
\r
// Before we close the RAF, we have to wind the current search down.\r
if (currentSearchOperation != null) {\r
}\r
\r
void updateLangButton() {\r
- langButton.setText(index.shortName.toUpperCase());\r
+// final LanguageResources languageResources = Language.isoCodeToResources.get(index.shortName);\r
+// if (languageResources != null && languageResources.flagId != 0) {\r
+// langButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, languageResources.flagId, 0);\r
+// } else {\r
+// langButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);\r
+ langButton.setText(index.shortName);\r
+// }\r
}\r
\r
void onLanguageButton() {\r
currentSearchOperation.interrupted.set(true);\r
currentSearchOperation = null;\r
}\r
+ changeIndexGetFocusAndResearch((indexIndex + 1)% dictionary.indices.size());\r
+ }\r
+ \r
+ void onLanguageButtonLongClick(final Context context) {\r
+ final Dialog dialog = new Dialog(context);\r
+ dialog.setContentView(R.layout.select_dictionary_dialog);\r
+ dialog.setTitle(R.string.selectDictionary);\r
+\r
+ final List<DictionaryInfo> installedDicts = ((DictionaryApplication)getApplication()).getUsableDicts();\r
+ ListView listView = (ListView) dialog.findViewById(android.R.id.list);\r
+ listView.setAdapter(new BaseAdapter() {\r
+ @Override\r
+ public View getView(int position, View convertView, ViewGroup parent) {\r
+ final LinearLayout result = new LinearLayout(parent.getContext());\r
+ final DictionaryInfo dictionaryInfo = getItem(position);\r
+ final Button button = new Button(parent.getContext());\r
+ final String name = application.getDictionaryName(dictionaryInfo.uncompressedFilename);\r
+ button.setText(name);\r
+ final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(), getLaunchIntent(application.getPath(dictionaryInfo.uncompressedFilename), 0, "")) {\r
+ @Override\r
+ protected void onGo() {\r
+ dialog.dismiss();\r
+ DictionaryActivity.this.finish();\r
+ };\r
+ };\r
+ button.setOnClickListener(intentLauncher);\r
+ \r
+ final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);\r
+ layoutParams.width = 0;\r
+ layoutParams.weight = 1.0f;\r
+ button.setLayoutParams(layoutParams);\r
+\r
+ result.addView(button);\r
+ return result;\r
+ }\r
+ \r
+ @Override\r
+ public long getItemId(int position) {\r
+ return position;\r
+ }\r
+ \r
+ @Override\r
+ public DictionaryInfo getItem(int position) {\r
+ return installedDicts.get(position);\r
+ }\r
+ \r
+ @Override\r
+ public int getCount() {\r
+ return installedDicts.size();\r
+ }\r
+ });\r
\r
- indexIndex = (indexIndex + 1) % dictionary.indices.size();\r
+ dialog.show();\r
+ }\r
+\r
+\r
+ private void changeIndexGetFocusAndResearch(final int newIndex) {\r
+ indexIndex = newIndex;\r
index = dictionary.indices.get(indexIndex);\r
indexAdapter = new IndexAdapter(index);\r
- Log.d(LOG, "onLanguageButton, newLang=" + index.longName);\r
+ Log.d(LOG, "changingIndex, newLang=" + index.longName);\r
setListAdapter(indexAdapter);\r
updateLangButton();\r
+ searchText.requestFocus(); // Otherwise, nothing may happen.\r
onSearchTextChange(searchText.getText().toString());\r
+ setDictionaryPrefs(this, dictFile, indexIndex, searchText.getText().toString());\r
}\r
\r
void onUpDownButton(final boolean up) {\r
+ if (isFiltered()) {\r
+ return;\r
+ }\r
final int firstVisibleRow = getListView().getFirstVisiblePosition();\r
final RowBase row = index.rows.get(firstVisibleRow);\r
final TokenRow tokenRow = row.getTokenRow(true);\r
Log.d(LOG, "onUpDownButton, destIndexEntry=" + dest.token);\r
searchText.removeTextChangedListener(searchTextWatcher);\r
searchText.setText(dest.token);\r
+ Selection.moveToRightEdge(searchText.getText(), searchText.getLayout());\r
jumpToRow(index.sortedIndexEntries.get(destIndexEntry).startRow);\r
searchText.addTextChangedListener(searchTextWatcher);\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
+ application.onCreateGlobalOptionsMenu(this, menu);\r
\r
{\r
- final MenuItem dictionaryList = menu.add(getString(R.string.dictionaryList));\r
+ final MenuItem dictionaryList = menu.add(getString(R.string.dictionaryManager));\r
dictionaryList.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
public boolean onMenuItemClick(final MenuItem menuItem) {\r
- startActivity(DictionaryListActivity.getIntent(DictionaryActivity.this));\r
+ startActivity(DictionaryManagerActivity.getLaunchIntent());\r
finish();\r
return false;\r
}\r
}\r
\r
{\r
- final MenuItem dictionaryEdit = menu.add(getString(R.string.editDictionary));\r
- dictionaryEdit.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
+ final MenuItem aboutDictionary = menu.add(getString(R.string.aboutDictionary));\r
+ aboutDictionary.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
public boolean onMenuItemClick(final MenuItem menuItem) {\r
- final Intent intent = DictionaryEditActivity.getIntent(dictIndex);\r
- startActivity(intent);\r
+ final Context context = getListView().getContext();\r
+ final Dialog dialog = new Dialog(context);\r
+ dialog.setContentView(R.layout.about_dictionary_dialog);\r
+ final TextView textView = (TextView) dialog.findViewById(R.id.text);\r
+\r
+ final String name = application.getDictionaryName(dictFile.getName());\r
+ dialog.setTitle(name);\r
+ \r
+ final StringBuilder builder = new StringBuilder();\r
+ final DictionaryInfo dictionaryInfo = dictionary.getDictionaryInfo();\r
+ dictionaryInfo.uncompressedBytes = dictFile.length();\r
+ if (dictionaryInfo != null) {\r
+ builder.append(dictionaryInfo.dictInfo).append("\n\n");\r
+ builder.append(getString(R.string.dictionaryPath, dictFile.getPath())).append("\n");\r
+ builder.append(getString(R.string.dictionarySize, dictionaryInfo.uncompressedBytes)).append("\n");\r
+ builder.append(getString(R.string.dictionaryCreationTime, dictionaryInfo.creationMillis)).append("\n");\r
+ for (final IndexInfo indexInfo : dictionaryInfo.indexInfos) {\r
+ builder.append("\n");\r
+ builder.append(getString(R.string.indexName, indexInfo.shortName)).append("\n");\r
+ builder.append(getString(R.string.mainTokenCount, indexInfo.mainTokenCount)).append("\n");\r
+ }\r
+ builder.append("\n");\r
+ builder.append(getString(R.string.sources)).append("\n");\r
+ for (final EntrySource source : dictionary.sources) {\r
+ builder.append(getString(R.string.sourceInfo, source.getName(), source.getNumEntries())).append("\n");\r
+ }\r
+ }\r
+// } else {\r
+// builder.append(getString(R.string.invalidDictionary));\r
+// }\r
+ textView.setText(builder.toString());\r
+ \r
+ dialog.show();\r
+ final WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();\r
+ layoutParams.width = WindowManager.LayoutParams.FILL_PARENT;\r
+ layoutParams.height = WindowManager.LayoutParams.FILL_PARENT;\r
+ dialog.getWindow().setAttributes(layoutParams);\r
return false;\r
}\r
});\r
return false;\r
}\r
});\r
+ \r
+ if (selectedSpannableText != null) {\r
+ final String selectedText = selectedSpannableText;\r
+ final MenuItem searchForSelection = menu.add(getString(R.string.searchForSelection, selectedSpannableText));\r
+ searchForSelection.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
+ public boolean onMenuItemClick(MenuItem item) {\r
+ int indexToUse = -1;\r
+ for (int i = 0; i < dictionary.indices.size(); ++i) {\r
+ final Index index = dictionary.indices.get(i);\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
+ 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
+ // Give focus back to list view because typing is done.\r
+ getListView().requestFocus();\r
+ return false;\r
+ }\r
+ });\r
+ }\r
+ \r
\r
}\r
\r
@Override\r
protected void onListItemClick(ListView l, View v, int row, long id) {\r
- openContextMenu(v);\r
+ defocusSearchText();\r
+ if (clickOpensContextMenu && dictRaf != null) {\r
+ openContextMenu(v);\r
+ }\r
}\r
\r
void onAppendToWordList(final RowBase row) {\r
+ defocusSearchText();\r
+ \r
final StringBuilder rawText = new StringBuilder();\r
rawText.append(\r
new SimpleDateFormat("yyyy.MM.dd HH:mm:ss").format(new Date()))\r
rawText.append(row.getTokenRow(true).getToken()).append("\t");\r
rawText.append(row.getRawText(saveOnlyFirstSubentry));\r
Log.d(LOG, "Writing : " + rawText);\r
+\r
try {\r
wordList.getParentFile().mkdirs();\r
final PrintWriter out = new PrintWriter(\r
}\r
return;\r
}\r
+ \r
+ /**\r
+ * Called when user clicks outside of search text, so that they can start\r
+ * typing again immediately.\r
+ */\r
+ void defocusSearchText() {\r
+ //Log.d(LOG, "defocusSearchText");\r
+ // Request focus so that if we start typing again, it clears the text input.\r
+ getListView().requestFocus();\r
+ \r
+ // Visual indication that a new keystroke will clear the search text.\r
+ searchText.selectAll();\r
+ }\r
\r
void onCopy(final RowBase row) {\r
+ defocusSearchText();\r
+\r
Log.d(LOG, "Copy, row=" + row);\r
final StringBuilder result = new StringBuilder();\r
result.append(row.getRawText(false));\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
+ setSearchText("" + (char) event.getUnicodeChar(), true);\r
}\r
return true;\r
}\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 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
\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
+ 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
// SearchOperation\r
Log.d(LOG, "searchFinished: " + searchOperation + ", searchResult=" + searchResult);\r
\r
currentSearchOperation = null;\r
-\r
uiHandler.postDelayed(new Runnable() {\r
@Override\r
public void run() {\r
if (currentSearchOperation == null) {\r
- jumpToRow(searchResult.startRow);\r
+ if (searchResult != null) {\r
+ if (isFiltered()) {\r
+ clearFiltered();\r
+ }\r
+ jumpToRow(searchResult.startRow);\r
+ } else if (searchOperation.multiWordSearchResult != null) {\r
+ // Multi-row search....\r
+ setFiltered(searchOperation);\r
+ } else {\r
+ throw new IllegalStateException("This should never happen.");\r
+ }\r
} else {\r
Log.d(LOG, "More coming, waiting for currentSearchOperation.");\r
}\r
}\r
- }, 50);\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
+ }, 20);\r
\r
}\r
\r
getListView().setSelected(true);\r
}\r
\r
+ static final Pattern WHITESPACE = Pattern.compile("\\s+");\r
final class SearchOperation implements Runnable {\r
\r
final AtomicBoolean interrupted = new AtomicBoolean(false);\r
final String searchText;\r
+ List<String> searchTokens; // filled in for multiWord.\r
final Index index;\r
\r
long searchStartMillis;\r
\r
Index.IndexEntry searchResult;\r
+ List<RowBase> multiWordSearchResult;\r
\r
boolean done = false;\r
\r
public void run() {\r
try {\r
searchStartMillis = System.currentTimeMillis();\r
- searchResult = index.findInsertionPoint(searchText, interrupted);\r
+ final String[] searchTokenArray = WHITESPACE.split(searchText);\r
+ if (searchTokenArray.length == 1) {\r
+ searchResult = index.findInsertionPoint(searchText, interrupted);\r
+ } else {\r
+ searchTokens = Arrays.asList(searchTokenArray);\r
+ multiWordSearchResult = index.multiWordSearch(searchTokens, interrupted);\r
+ }\r
Log.d(LOG, "searchText=" + searchText + ", searchDuration="\r
+ (System.currentTimeMillis() - searchStartMillis) + ", interrupted="\r
+ interrupted.get());\r
// IndexAdapter\r
// --------------------------------------------------------------------------\r
\r
- static final class IndexAdapter extends BaseAdapter {\r
+ final class IndexAdapter extends BaseAdapter {\r
\r
final Index index;\r
+ final List<RowBase> rows;\r
+ final Set<String> toHighlight;\r
\r
IndexAdapter(final Index index) {\r
this.index = index;\r
+ rows = index.rows;\r
+ this.toHighlight = null;\r
+ }\r
+\r
+ IndexAdapter(final Index index, final List<RowBase> rows, final List<String> toHighlight) {\r
+ this.index = index;\r
+ this.rows = rows;\r
+ this.toHighlight = new LinkedHashSet<String>(toHighlight);\r
}\r
\r
@Override\r
public int getCount() {\r
- return index.rows.size();\r
+ return rows.size();\r
}\r
\r
@Override\r
public RowBase getItem(int position) {\r
- return index.rows.get(position);\r
+ return rows.get(position);\r
}\r
\r
@Override\r
}\r
\r
@Override\r
- public View getView(int position, View convertView, ViewGroup parent) {\r
- final RowBase row = index.rows.get(position);\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((PairEntry.Row) row, parent);\r
+ return getView(position, (PairEntry.Row) row, parent, result);\r
} else if (row instanceof TokenRow) {\r
- return getView((TokenRow) row, parent);\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(PairEntry.Row row, ViewGroup parent) {\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
- TextView column1 = new TextView(tableRow.getContext());\r
- TextView column2 = new TextView(tableRow.getContext());\r
- final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams();\r
- layoutParams.weight = 0.5f;\r
+ final TextView col1 = new TextView(tableRow.getContext());\r
+ final TextView col2 = new TextView(tableRow.getContext());\r
\r
+ // Set the columns in the table.\r
if (r > 0) {\r
- final TextView spacer = new TextView(tableRow.getContext());\r
- spacer.setText(" • ");\r
- tableRow.addView(spacer);\r
+ final TextView bullet = new TextView(tableRow.getContext());\r
+ bullet.setText(" • ");\r
+ tableRow.addView(bullet);\r
}\r
- tableRow.addView(column1, layoutParams);\r
+ tableRow.addView(col1, layoutParams);\r
+ final TextView margin = new TextView(tableRow.getContext());\r
+ margin.setText(" ");\r
+ tableRow.addView(margin);\r
if (r > 0) {\r
- final TextView spacer = new TextView(tableRow.getContext());\r
- spacer.setText(" • ");\r
- tableRow.addView(spacer);\r
+ final TextView bullet = new TextView(tableRow.getContext());\r
+ bullet.setText(" • ");\r
+ tableRow.addView(bullet);\r
}\r
- tableRow.addView(column2, layoutParams);\r
-\r
- column1.setWidth(1);\r
- column2.setWidth(1);\r
+ tableRow.addView(col2, layoutParams);\r
+ col1.setWidth(1);\r
+ col2.setWidth(1);\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
- column1.setText(col1Text, TextView.BufferType.SPANNABLE);\r
- final Spannable col1Spannable = (Spannable) column1.getText();\r
+ final String col2Text = index.swapPairEntries ? pair.lang1 : pair.lang2;\r
\r
- int startPos = 0;\r
- final String token = row.getTokenRow(true).getToken();\r
- while ((startPos = col1Text.indexOf(token, startPos)) != -1) {\r
- col1Spannable.setSpan(new StyleSpan(Typeface.BOLD), startPos,\r
- startPos + token.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);\r
- startPos += token.length();\r
+ col1.setText(col1Text, TextView.BufferType.SPANNABLE);\r
+ col2.setText(col2Text, TextView.BufferType.SPANNABLE);\r
+ \r
+ // Bold the token instances in col1.\r
+ final Set<String> toBold = toHighlight != null ? this.toHighlight : Collections.singleton(row.getTokenRow(true).getToken());\r
+ final Spannable col1Spannable = (Spannable) col1.getText();\r
+ for (final String token : toBold) {\r
+ int startPos = 0;\r
+ while ((startPos = col1Text.indexOf(token, startPos)) != -1) {\r
+ col1Spannable.setSpan(new StyleSpan(Typeface.BOLD), startPos,\r
+ startPos + token.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);\r
+ startPos += token.length();\r
+ }\r
}\r
-\r
- final String col2Text = index.swapPairEntries ? pair.lang1 : pair.lang2;\r
- column2.setText(col2Text, TextView.BufferType.NORMAL);\r
-\r
+ \r
+ createTokenLinkSpans(col1, col1Spannable, col1Text);\r
+ createTokenLinkSpans(col2, (Spannable) col2.getText(), col2Text);\r
+ \r
+ col1.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);\r
+ col2.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);\r
+ // col2.setBackgroundResource(theme.otherLangBg);\r
+ \r
+ if (index.swapPairEntries) {\r
+ col2.setOnLongClickListener(textViewLongClickListenerIndex0);\r
+ col1.setOnLongClickListener(textViewLongClickListenerIndex1);\r
+ } else {\r
+ col1.setOnLongClickListener(textViewLongClickListenerIndex0);\r
+ col2.setOnLongClickListener(textViewLongClickListenerIndex1);\r
+ }\r
+ \r
result.addView(tableRow);\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(getListView(), v, position, position);\r
+ }\r
+ });\r
+\r
return result;\r
}\r
\r
- private View getView(TokenRow row, ViewGroup parent) {\r
- final TextView textView = new TextView(parent.getContext());\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.setTextSize(20);\r
- return textView;\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
+ \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
+\r
+ static final Pattern CHAR_DASH = Pattern.compile("['\\p{L}0-9]+");\r
+\r
+ private void createTokenLinkSpans(final TextView textView, final Spannable spannable, final String text) {\r
+ // Saw from the source code that LinkMovementMethod sets the selection!\r
+ // http://grepcode.com/file/repository.grepcode.com/java/ext/com.google.android/android/2.3.1_r1/android/text/method/LinkMovementMethod.java#LinkMovementMethod\r
+ textView.setMovementMethod(LinkMovementMethod.getInstance());\r
+ final Matcher matcher = CHAR_DASH.matcher(text);\r
+ while (matcher.find()) {\r
+ spannable.setSpan(new NonLinkClickableSpan(), matcher.start(), matcher.end(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);\r
}\r
+ }\r
+ \r
+\r
+ String selectedSpannableText = null;\r
+ int selectedSpannableIndex = -1;\r
+\r
+ @Override\r
+ public boolean onTouchEvent(MotionEvent event) {\r
+ selectedSpannableText = null;\r
+ selectedSpannableIndex = -1;\r
+ return super.onTouchEvent(event);\r
+ }\r
+\r
+ private class TextViewLongClickListener implements OnLongClickListener {\r
+ final int index;\r
\r
+ private TextViewLongClickListener(final int index) {\r
+ this.index = index;\r
+ }\r
+\r
+ @Override\r
+ public boolean onLongClick(final View v) {\r
+ final TextView textView = (TextView) v;\r
+ final int start = textView.getSelectionStart();\r
+ final int end = textView.getSelectionEnd();\r
+ if (start >= 0 && end >= 0) {\r
+ selectedSpannableText = textView.getText().subSequence(start, end).toString();\r
+ selectedSpannableIndex = index;\r
+ }\r
+ return false;\r
+ }\r
}\r
+ final TextViewLongClickListener textViewLongClickListenerIndex0 = new TextViewLongClickListener(0);\r
+ final TextViewLongClickListener textViewLongClickListenerIndex1 = new TextViewLongClickListener(1);\r
+ \r
\r
// --------------------------------------------------------------------------\r
// SearchText\r
// --------------------------------------------------------------------------\r
\r
void onSearchTextChange(final String text) {\r
+ if ("thadolina".equals(text)) {\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
Log.d(LOG, "searchText changed during shutdown, doing nothing.");\r
return;\r
}\r
}\r
\r
+ // --------------------------------------------------------------------------\r
+ // Filtered results.\r
+ // --------------------------------------------------------------------------\r
+\r
+ boolean isFiltered() {\r
+ return rowsToShow != null;\r
+ }\r
+\r
+ void setFiltered(final SearchOperation searchOperation) {\r
+ ((Button) findViewById(R.id.UpButton)).setEnabled(false);\r
+ ((Button) findViewById(R.id.DownButton)).setEnabled(false);\r
+ rowsToShow = searchOperation.multiWordSearchResult;\r
+ setListAdapter(new IndexAdapter(index, rowsToShow, searchOperation.searchTokens));\r
+ }\r
+\r
+ void clearFiltered() {\r
+ ((Button) findViewById(R.id.UpButton)).setEnabled(true);\r
+ ((Button) findViewById(R.id.DownButton)).setEnabled(true);\r
+ setListAdapter(new IndexAdapter(index));\r
+ rowsToShow = null;\r
+ }\r
+\r
}\r
projects / Dictionary.git / blobdiff