X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryActivity.java;h=f8cca586e94f6e6cb7cb27a01a184a7570a84bb4;hb=56c7d964a83199140532764b9ecf05594a2e8531;hp=96f385e9c048ac78c6cfe2469d6748e85521ae9b;hpb=c79058e796a2f2555c9f361934e733c4e31e08df;p=Dictionary.git diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java index 96f385e..f8cca58 100644 --- a/src/com/hughes/android/dictionary/DictionaryActivity.java +++ b/src/com/hughes/android/dictionary/DictionaryActivity.java @@ -1,5 +1,5 @@ // Copyright 2011 Google Inc. All Rights Reserved. -// +// Some Parts Copyright 2013 Dominik Köppl // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at @@ -14,11 +14,13 @@ package com.hughes.android.dictionary; +import android.annotation.SuppressLint; import android.app.Dialog; -import android.app.ListActivity; +import android.app.SearchManager; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.graphics.Color; import android.graphics.Typeface; import android.net.Uri; import android.os.Bundle; @@ -26,11 +28,14 @@ import android.os.Handler; import android.preference.PreferenceManager; import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech.OnInitListener; +import android.support.v4.view.MenuItemCompat; +import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarActivity; +import android.support.v7.widget.SearchView; +import android.support.v7.widget.SearchView.OnQueryTextListener; +import android.support.v7.widget.Toolbar; import android.text.ClipboardManager; -import android.text.Editable; -import android.text.Selection; import android.text.Spannable; -import android.text.TextWatcher; import android.text.method.LinkMovementMethod; import android.text.style.ClickableSpan; import android.text.style.StyleSpan; @@ -38,6 +43,7 @@ import android.util.Log; import android.util.TypedValue; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; +import android.view.Gravity; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; @@ -45,18 +51,20 @@ import android.view.MenuItem.OnMenuItemClickListener; import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; -import android.view.View.OnFocusChangeListener; import android.view.View.OnLongClickListener; import android.view.ViewGroup; import android.view.WindowManager; +import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; +import android.widget.AdapterView.OnItemClickListener; import android.widget.BaseAdapter; import android.widget.Button; -import android.widget.EditText; +import android.widget.FrameLayout; import android.widget.ImageButton; import android.widget.ImageView; +import android.widget.ImageView.ScaleType; import android.widget.LinearLayout; import android.widget.ListAdapter; import android.widget.ListView; @@ -72,6 +80,7 @@ import com.hughes.android.dictionary.engine.EntrySource; import com.hughes.android.dictionary.engine.HtmlEntry; import com.hughes.android.dictionary.engine.Index; import com.hughes.android.dictionary.engine.Index.IndexEntry; +import com.hughes.android.dictionary.engine.Language.LanguageResources; import com.hughes.android.dictionary.engine.PairEntry; import com.hughes.android.dictionary.engine.PairEntry.Pair; import com.hughes.android.dictionary.engine.RowBase; @@ -79,6 +88,7 @@ import com.hughes.android.dictionary.engine.TokenRow; import com.hughes.android.dictionary.engine.TransliteratorManager; import com.hughes.android.util.IntentLauncher; import com.hughes.android.util.NonLinkClickableSpan; +import com.hughes.util.StringUtil; import java.io.File; import java.io.FileWriter; @@ -102,14 +112,13 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class DictionaryActivity extends ListActivity { +public class DictionaryActivity extends ActionBarActivity { static final String LOG = "QuickDic"; DictionaryApplication application; File dictFile = null; - RandomAccessFile dictRaf = null; Dictionary dictionary = null; @@ -120,11 +129,9 @@ public class DictionaryActivity extends ListActivity { List rowsToShow = null; // if not null, just show these rows. - // package for test. - final Handler uiHandler = new Handler(); + final Random rand = new Random(); - TextToSpeech textToSpeech; - volatile boolean ttsReady; + final Handler uiHandler = new Handler(); private final Executor searchExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() { @Override @@ -135,28 +142,44 @@ public class DictionaryActivity extends ListActivity { private SearchOperation currentSearchOperation = null; - C.Theme theme = C.Theme.LIGHT; + TextToSpeech textToSpeech; + volatile boolean ttsReady; Typeface typeface; - + DictionaryApplication.Theme theme = DictionaryApplication.Theme.LIGHT; + int textColorFg = Color.BLACK; int fontSizeSp; - EditText searchText; + private ListView listView; + private ListView getListView() { + if (listView == null) { + listView = (ListView)findViewById(android.R.id.list); + } + return listView; + } + + private void setListAdapter(ListAdapter adapter) { + getListView().setAdapter(adapter); + } + + private ListAdapter getListAdapter() { + return getListView().getAdapter(); + } + + SearchView searchView; + ImageButton languageButton; + SearchView.OnQueryTextListener onQueryTextListener; - Button langButton; + MenuItem nextWordMenuItem, previousWordMenuItem, randomWordMenuItem; // Never null. private File wordList = null; - private boolean saveOnlyFirstSubentry = false; - private boolean clickOpensContextMenu = false; // Visible for testing. ListAdapter indexAdapter = null; - final SearchTextWatcher searchTextWatcher = new SearchTextWatcher(); - /** * For some languages, loading the transliterators used in this search takes * a long time, so we fire it up on a different thread, and don't invoke it @@ -167,13 +190,11 @@ public class DictionaryActivity extends ListActivity { public DictionaryActivity() { } - public static Intent getLaunchIntent(final File dictFile, final int indexIndex, + public static Intent getLaunchIntent(Context c, final File dictFile, final String indexShortName, final String searchToken) { - final Intent intent = new Intent(); - intent.setClassName(DictionaryActivity.class.getPackage().getName(), - DictionaryActivity.class.getName()); + final Intent intent = new Intent(c, DictionaryActivity.class); intent.putExtra(C.DICT_FILE, dictFile.getPath()); - intent.putExtra(C.INDEX_INDEX, indexIndex); + intent.putExtra(C.INDEX_SHORT_NAME, indexShortName); intent.putExtra(C.SEARCH_TOKEN, searchToken); return intent; } @@ -181,41 +202,133 @@ public class DictionaryActivity extends ListActivity { @Override protected void onSaveInstanceState(final Bundle outState) { super.onSaveInstanceState(outState); - Log.d(LOG, "onSaveInstanceState: " + searchText.getText().toString()); - outState.putInt(C.INDEX_INDEX, indexIndex); - outState.putString(C.SEARCH_TOKEN, searchText.getText().toString()); - } - - @Override - protected void onRestoreInstanceState(final Bundle outState) { - super.onRestoreInstanceState(outState); - Log.d(LOG, "onRestoreInstanceState: " + outState.getString(C.SEARCH_TOKEN)); - onCreate(outState); + Log.d(LOG, "onSaveInstanceState: " + searchView.getQuery().toString()); + outState.putString(C.INDEX_SHORT_NAME, index.shortName); + outState.putString(C.SEARCH_TOKEN, searchView.getQuery().toString()); } @Override public void onCreate(Bundle savedInstanceState) { - final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - prefs.edit().remove(C.INDEX_INDEX).commit(); // Don't auto-launch if - // this fails. - + // This needs to be before super.onCreate, otherwise ActionbarSherlock + // doesn't makes the background of the actionbar white when you're + // in the dark theme. setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId); Log.d(LOG, "onCreate:" + this); super.onCreate(savedInstanceState); + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + + // Don't auto-launch if this fails. + prefs.edit().remove(C.DICT_FILE).commit(); + + setContentView(R.layout.dictionary_activity); + application = (DictionaryApplication) getApplication(); theme = application.getSelectedTheme(); + textColorFg = getResources().getColor(theme.tokenRowFgColor); final Intent intent = getIntent(); - dictFile = new File(intent.getStringExtra(C.DICT_FILE)); + String intentAction = intent.getAction(); + /** + * @author Dominik Köppl Querying the Intent + * com.hughes.action.ACTION_SEARCH_DICT is the advanced query + * Arguments: SearchManager.QUERY -> the phrase to search from + * -> language in which the phrase is written to -> to which + * language shall be translated + */ + if (intentAction != null && intentAction.equals("com.hughes.action.ACTION_SEARCH_DICT")) + { + String query = intent.getStringExtra(SearchManager.QUERY); + String from = intent.getStringExtra("from"); + if (from != null) + from = from.toLowerCase(Locale.US); + String to = intent.getStringExtra("to"); + if (to != null) + to = to.toLowerCase(Locale.US); + if (query != null) + { + getIntent().putExtra(C.SEARCH_TOKEN, query); + } + if (intent.getStringExtra(C.DICT_FILE) == null && (from != null || to != null)) + { + Log.d(LOG, "DictSearch: from: " + from + " to " + to); + List dicts = application.getDictionariesOnDevice(null); + for (DictionaryInfo info : dicts) + { + boolean hasFrom = from == null; + boolean hasTo = to == null; + for (IndexInfo index : info.indexInfos) + { + if (!hasFrom && index.shortName.toLowerCase(Locale.US).equals(from)) + hasFrom = true; + if (!hasTo && index.shortName.toLowerCase(Locale.US).equals(to)) + hasTo = true; + } + if (hasFrom && hasTo) + { + if (from != null) + { + int which_index = 0; + for (; which_index < info.indexInfos.size(); ++which_index) + { + if (info.indexInfos.get(which_index).shortName.toLowerCase( + Locale.US).equals(from)) + break; + } + intent.putExtra(C.INDEX_SHORT_NAME, + info.indexInfos.get(which_index).shortName); + + } + intent.putExtra(C.DICT_FILE, application.getPath(info.uncompressedFilename) + .toString()); + break; + } + } + + } + } + /** + * @author Dominik Köppl Querying the Intent Intent.ACTION_SEARCH is a + * simple query Arguments follow from android standard (see + * documentation) + */ + if (intentAction != null && intentAction.equals(Intent.ACTION_SEARCH)) + { + String query = intent.getStringExtra(SearchManager.QUERY); + if (query != null) + getIntent().putExtra(C.SEARCH_TOKEN, query); + } + /** + * @author Dominik Köppl If no dictionary is chosen, use the default + * dictionary specified in the preferences If this step does + * fail (no default directory specified), show a toast and + * abort. + */ + if (intent.getStringExtra(C.DICT_FILE) == null) + { + String dictfile = prefs.getString(getString(R.string.defaultDicKey), null); + if (dictfile != null) + intent.putExtra(C.DICT_FILE, application.getPath(dictfile).toString()); + } + String dictFilename = intent.getStringExtra(C.DICT_FILE); + + if (dictFilename == null) + { + Toast.makeText(this, getString(R.string.no_dict_file), Toast.LENGTH_LONG).show(); + startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext())); + finish(); + return; + } + if (dictFilename != null) + dictFile = new File(dictFilename); ttsReady = false; textToSpeech = new TextToSpeech(getApplicationContext(), new OnInitListener() { @Override public void onInit(int status) { ttsReady = true; - updateTTSLanuage(); + updateTTSLanguage(); } }); @@ -236,15 +349,21 @@ public class DictionaryActivity extends ListActivity { } Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()), Toast.LENGTH_LONG).show(); - startActivity(DictionaryManagerActivity.getLaunchIntent()); + startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext())); finish(); return; } - indexIndex = intent.getIntExtra(C.INDEX_INDEX, 0); - if (savedInstanceState != null) { - indexIndex = savedInstanceState.getInt(C.INDEX_INDEX, indexIndex); + String targetIndex = intent.getStringExtra(C.INDEX_SHORT_NAME); + if (savedInstanceState != null && savedInstanceState.getString(C.INDEX_SHORT_NAME) != null) { + targetIndex = savedInstanceState.getString(C.INDEX_SHORT_NAME); + } + indexIndex = 0; + for (int i = 0; i < dictionary.indices.size(); ++i) { + if (dictionary.indices.get(i).shortName.equals(targetIndex)) { + indexIndex = i; + break; + } } - indexIndex %= dictionary.indices.size(); Log.d(LOG, "Loading index " + indexIndex); index = dictionary.indices.get(indexIndex); setListAdapter(new IndexAdapter(index)); @@ -252,6 +371,7 @@ public class DictionaryActivity extends ListActivity { // Pre-load the collators. new Thread(new Runnable() { public void run() { + android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND); final long startMillis = System.currentTimeMillis(); try { TransliteratorManager.init(new TransliteratorManager.Callback() { @@ -260,7 +380,7 @@ public class DictionaryActivity extends ListActivity { uiHandler.post(new Runnable() { @Override public void run() { - onSearchTextChange(searchText.getText().toString()); + onSearchTextChange(searchView.getQuery().toString()); } }); } @@ -282,10 +402,19 @@ public class DictionaryActivity extends ListActivity { } }).start(); - String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.ttf.jpg"); + String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.otf.jpg"); if ("SYSTEM".equals(fontName)) { typeface = Typeface.DEFAULT; + } else if ("SERIF".equals(fontName)) { + typeface = Typeface.SERIF; + } else if ("SANS_SERIF".equals(fontName)) { + typeface = Typeface.SANS_SERIF; + } else if ("MONOSPACE".equals(fontName)) { + typeface = Typeface.MONOSPACE; } else { + if ("FreeSerif.ttf.jpg".equals(fontName)) { + fontName = "FreeSerif.otf.jpg"; + } try { typeface = Typeface.createFromAsset(getAssets(), fontName); } catch (Exception e) { @@ -294,10 +423,6 @@ public class DictionaryActivity extends ListActivity { Toast.LENGTH_LONG).show(); } } - // if (!"SYSTEM".equals(fontName)) { - // throw new RuntimeException("Test force using system font: " + - // fontName); - // } if (typeface == null) { Log.w(LOG, "Unable to create typeface, using default."); typeface = Typeface.DEFAULT; @@ -309,16 +434,18 @@ public class DictionaryActivity extends ListActivity { fontSizeSp = 14; } - setContentView(R.layout.dictionary_activity); - searchText = (EditText) findViewById(R.id.SearchText); - searchText.requestFocus(); - searchText.addTextChangedListener(searchTextWatcher); - searchText.setOnFocusChangeListener(new OnFocusChangeListener() { - @Override - public void onFocusChange(View v, boolean hasFocus) { - Log.d(LOG, "searchText onFocusChange hasFocus=" + hasFocus); - } - }); + // ContextMenu. + registerForContextMenu(getListView()); + + // Cache some prefs. + wordList = application.getWordListFile(); + saveOnlyFirstSubentry = prefs.getBoolean(getString(R.string.saveOnlyFirstSubentryKey), + false); + clickOpensContextMenu = prefs.getBoolean(getString(R.string.clickOpensContextMenuKey), + false); + Log.d(LOG, "wordList=" + wordList + ", saveOnlyFirstSubentry=" + saveOnlyFirstSubentry); + + onCreateSetupActionBarAndSearchView(); // Set the search text from the intent, then the saved state. String text = getIntent().getStringExtra(C.SEARCH_TOKEN); @@ -331,80 +458,95 @@ public class DictionaryActivity extends ListActivity { setSearchText(text, true); Log.d(LOG, "Trying to restore searchText=" + text); - final View clearSearchTextButton = findViewById(R.id.ClearSearchTextButton); - clearSearchTextButton.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - onClearSearchTextButton(); + setDictionaryPrefs(this, dictFile, index.shortName, searchView.getQuery().toString()); + + updateLangButton(); + searchView.requestFocus(); + + // http://stackoverflow.com/questions/2833057/background-listview-becomes-black-when-scrolling +// getListView().setCacheColorHint(0); + } + + private void onCreateSetupActionBarAndSearchView() { + ActionBar actionBar = getSupportActionBar(); + actionBar.setDisplayShowTitleEnabled(false); + actionBar.setDisplayShowHomeEnabled(false); + actionBar.setDisplayHomeAsUpEnabled(false); + + final LinearLayout customSearchView = new LinearLayout(getSupportActionBar().getThemedContext()); + + final int width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 300, + getResources().getDisplayMetrics()); + final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams( + ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + customSearchView.setLayoutParams(layoutParams); + + listView.setOnItemClickListener(new OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int row, long id) { + onListItemClick(getListView(), view, row, id); } }); - clearSearchTextButton.setVisibility(PreferenceManager.getDefaultSharedPreferences(this) - .getBoolean(getString(R.string.showClearSearchTextButtonKey), true) ? View.VISIBLE - : View.GONE); - - langButton = (Button) findViewById(R.id.LangButton); - langButton.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - onLanguageButton(); + + languageButton = new ImageButton(customSearchView.getContext()); + languageButton.setScaleType(ScaleType.FIT_CENTER); + languageButton.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View arg0) { + onLanguageButtonClick(); } }); - langButton.setOnLongClickListener(new OnLongClickListener() { + languageButton.setOnLongClickListener(new OnLongClickListener() { @Override public boolean onLongClick(View v) { onLanguageButtonLongClick(v.getContext()); return true; } }); - updateLangButton(); - - final View upButton = findViewById(R.id.UpButton); - upButton.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - onUpDownButton(true); - } - }); - final View downButton = findViewById(R.id.DownButton); - downButton.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - onUpDownButton(false); + languageButton.setAdjustViewBounds(true); + LinearLayout.LayoutParams lpb = new LinearLayout.LayoutParams(application.languageButtonPixels, LinearLayout.LayoutParams.MATCH_PARENT); + customSearchView.addView(languageButton, lpb); + + searchView = new SearchView(getSupportActionBar().getThemedContext()); + searchView.setIconifiedByDefault(false); + // searchView.setIconified(false); // puts the magnifying glass in the + // wrong place. + searchView.setQueryHint(getString(R.string.searchText)); + searchView.setSubmitButtonEnabled(false); + searchView.setImeOptions( + EditorInfo.IME_ACTION_SEARCH | + EditorInfo.IME_FLAG_NO_EXTRACT_UI | + EditorInfo.IME_FLAG_NO_ENTER_ACTION | + // EditorInfo.IME_FLAG_NO_FULLSCREEN | // Requires API + // 11 + EditorInfo.IME_MASK_ACTION | + EditorInfo.TYPE_TEXT_FLAG_NO_SUGGESTIONS); + onQueryTextListener = new OnQueryTextListener() { + @Override + public boolean onQueryTextSubmit(String query) { + Log.d(LOG, "OnQueryTextListener: onQueryTextSubmit: " + searchView.getQuery()); + return true; } - }); - -// getListView().setOnItemSelectedListener(new ListView.OnItemSelectedListener() { -// @Override -// public void onItemSelected(AdapterView adapterView, View arg1, final int position, -// long id) { -// if (!searchText.isFocused()) { -// if (!isFiltered()) { -// final RowBase row = (RowBase) getListAdapter().getItem(position); -// Log.d(LOG, "onItemSelected: " + row.index()); -// final TokenRow tokenRow = row.getTokenRow(true); -// searchText.setText(tokenRow.getToken()); -// } -// } -// } -// -// @Override -// public void onNothingSelected(AdapterView arg0) { -// } -// }); -// - // ContextMenu. - registerForContextMenu(getListView()); - - // Prefs. - wordList = new File(prefs.getString(getString(R.string.wordListFileKey), - getString(R.string.wordListFileDefault))); - saveOnlyFirstSubentry = prefs.getBoolean(getString(R.string.saveOnlyFirstSubentryKey), - false); - clickOpensContextMenu = prefs.getBoolean(getString(R.string.clickOpensContextMenuKey), - false); - // if (prefs.getBoolean(getString(R.string.vibrateOnFailedSearchKey), - // true)) { - // vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE); - // } - Log.d(LOG, "wordList=" + wordList + ", saveOnlyFirstSubentry=" + saveOnlyFirstSubentry); - setDictionaryPrefs(this, dictFile, indexIndex, searchText.getText().toString()); + @Override + public boolean onQueryTextChange(String newText) { + Log.d(LOG, "OnQueryTextListener: onQueryTextChange: " + searchView.getQuery()); + onSearchTextChange(searchView.getQuery().toString()); + return true; + } + }; + searchView.setOnQueryTextListener(onQueryTextListener); + searchView.setFocusable(true); + LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(0, + FrameLayout.LayoutParams.WRAP_CONTENT, 1); + customSearchView.addView(searchView, lp); + + actionBar.setCustomView(customSearchView); + actionBar.setDisplayShowCustomEnabled(true); + + // Avoid wasting space on large left inset + Toolbar tb = (Toolbar)customSearchView.getParent(); + tb.setContentInsetsRelative(0, 0); } @Override @@ -425,6 +567,10 @@ public class DictionaryActivity extends ListActivity { } @Override + /** + * Invoked when MyWebView returns, since the user might have clicked some + * hypertext in the MyWebView. + */ protected void onActivityResult(int requestCode, int resultCode, Intent result) { super.onActivityResult(requestCode, resultCode, result); if (result != null && result.hasExtra(C.SEARCH_TOKEN)) { @@ -434,11 +580,11 @@ public class DictionaryActivity extends ListActivity { } private static void setDictionaryPrefs(final Context context, final File dictFile, - final int indexIndex, final String searchToken) { + final String indexShortName, final String searchToken) { final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences( context).edit(); prefs.putString(C.DICT_FILE, dictFile.getPath()); - prefs.putInt(C.INDEX_INDEX, indexIndex); + prefs.putString(C.INDEX_SHORT_NAME, indexShortName); prefs.putString(C.SEARCH_TOKEN, ""); // Don't need to save search token. prefs.commit(); } @@ -473,52 +619,74 @@ public class DictionaryActivity extends ListActivity { // Buttons // -------------------------------------------------------------------------- - private void onClearSearchTextButton() { - setSearchText("", true); - showKeyboard(); + private void showKeyboard() { + // For some reason, this doesn't always work the first time. + // One way to replicate the problem: + // Press the "task switch" button repeatedly to pause and resume + for (int delay = 1; delay <= 101; delay += 100) { + searchView.postDelayed(new Runnable() { + @Override + public void run() { + Log.d(LOG, "Trying to show soft keyboard."); + final boolean searchTextHadFocus = searchView.hasFocus(); + searchView.requestFocusFromTouch(); + final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + manager.showSoftInput(searchView, InputMethodManager.SHOW_IMPLICIT); + if (!searchTextHadFocus) { + defocusSearchText(); + } + } + }, delay); + } } - private void showKeyboard() { - searchText.postDelayed(new Runnable() { - @Override - public void run() { - Log.d(LOG, "Trying to show soft keyboard."); - final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT); - }}, 100); + private void hideKeyboard() { + Log.d(LOG, "Hide soft keyboard."); + searchView.clearFocus(); + InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); + manager.hideSoftInputFromWindow(searchView.getWindowToken(), 0); } void updateLangButton() { - // final LanguageResources languageResources = - // Language.isoCodeToResources.get(index.shortName); - // if (languageResources != null && languageResources.flagId != 0) { - // langButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, - // languageResources.flagId, 0); - // } else { - // langButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); - langButton.setText(index.shortName); - // } - updateTTSLanuage(); + final LanguageResources languageResources = + DictionaryApplication.isoCodeToResources.get(index.shortName); + if (languageResources != null && languageResources.flagId != 0) { + languageButton.setImageResource(languageResources.flagId); + } else { + if (indexIndex % 2 == 0) { + languageButton.setImageResource(android.R.drawable.ic_media_next); + } else { + languageButton.setImageResource(android.R.drawable.ic_media_previous); + } + } + updateTTSLanguage(); } - private void updateTTSLanuage() { - if (!ttsReady) { + private void updateTTSLanguage() { + if (!ttsReady || index == null || textToSpeech == null) { + Log.d(LOG, "Can't updateTTSLanguage."); return; } final Locale locale = new Locale(index.sortLanguage.getIsoCode()); Log.d(LOG, "Setting TTS locale to: " + locale); final int ttsResult = textToSpeech.setLanguage(locale); - if (ttsResult != TextToSpeech.LANG_AVAILABLE || ttsResult != TextToSpeech.LANG_COUNTRY_AVAILABLE) { + if (ttsResult != TextToSpeech.LANG_AVAILABLE || + ttsResult != TextToSpeech.LANG_COUNTRY_AVAILABLE) { Log.e(LOG, "TTS not available in this language: ttsResult=" + ttsResult); } } - void onLanguageButton() { + void onLanguageButtonClick() { + if (dictionary.indices.size() == 1) { + // No need to work to switch indices. + return; + } if (currentSearchOperation != null) { currentSearchOperation.interrupted.set(true); currentSearchOperation = null; } - changeIndexAndResearch((indexIndex + 1) % dictionary.indices.size()); + setIndexAndSearchText((indexIndex + 1) % dictionary.indices.size(), + searchView.getQuery().toString()); } void onLanguageButtonLongClick(final Context context) { @@ -526,32 +694,22 @@ public class DictionaryActivity extends ListActivity { dialog.setContentView(R.layout.select_dictionary_dialog); dialog.setTitle(R.string.selectDictionary); - final List installedDicts = ((DictionaryApplication) getApplication()) - .getUsableDicts(); + final List installedDicts = application.getDictionariesOnDevice(null); ListView listView = (ListView) dialog.findViewById(android.R.id.list); - - // final LinearLayout.LayoutParams layoutParams = new - // LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, - // ViewGroup.LayoutParams.WRAP_CONTENT); - // layoutParams.width = 0; - // layoutParams.weight = 1.0f; - final Button button = new Button(listView.getContext()); final String name = getString(R.string.dictionaryManager); button.setText(name); final IntentLauncher intentLauncher = new IntentLauncher(listView.getContext(), - DictionaryManagerActivity.getLaunchIntent()) { + DictionaryManagerActivity.getLaunchIntent(getApplicationContext())) { @Override protected void onGo() { dialog.dismiss(); DictionaryActivity.this.finish(); - }; + } }; button.setOnClickListener(intentLauncher); - // button.setLayoutParams(layoutParams); listView.addHeaderView(button); - // listView.setHeaderDividersEnabled(true); listView.setAdapter(new BaseAdapter() { @Override @@ -561,28 +719,21 @@ public class DictionaryActivity extends ListActivity { final LinearLayout result = new LinearLayout(parent.getContext()); for (int i = 0; i < dictionaryInfo.indexInfos.size(); ++i) { - if (i > 0) { - final TextView dash = new TextView(parent.getContext()); - dash.setText("-"); - result.addView(dash); - } - final IndexInfo indexInfo = dictionaryInfo.indexInfos.get(i); - final Button button = new Button(parent.getContext()); - button.setText(indexInfo.shortName); + final View button = application.createButton(parent.getContext(), + dictionaryInfo, indexInfo); final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(), - getLaunchIntent( + getLaunchIntent(getApplicationContext(), application.getPath(dictionaryInfo.uncompressedFilename), - i, searchText.getText().toString())) { + indexInfo.shortName, searchView.getQuery().toString())) { @Override protected void onGo() { dialog.dismiss(); DictionaryActivity.this.finish(); - }; + } }; button.setOnClickListener(intentLauncher); result.addView(button); - } final TextView nameView = new TextView(parent.getContext()); @@ -594,8 +745,8 @@ public class DictionaryActivity extends ListActivity { layoutParams.width = 0; layoutParams.weight = 1.0f; nameView.setLayoutParams(layoutParams); + nameView.setGravity(Gravity.CENTER_VERTICAL); result.addView(nameView); - return result; } @@ -614,26 +765,9 @@ public class DictionaryActivity extends ListActivity { return installedDicts.size(); } }); - dialog.show(); } - private void changeIndexAndResearch(int newIndex) { - Log.d(LOG, "Changing index to: " + newIndex); - if (newIndex == -1) { - Log.e(LOG, "Invalid index."); - newIndex = 0; - } - indexIndex = newIndex; - index = dictionary.indices.get(indexIndex); - indexAdapter = new IndexAdapter(index); - Log.d(LOG, "changingIndex, newLang=" + index.longName); - setDictionaryPrefs(this, dictFile, indexIndex, searchText.getText().toString()); - setListAdapter(indexAdapter); - updateLangButton(); - setSearchText(searchText.getText().toString(), true); - } - void onUpDownButton(final boolean up) { if (isFiltered()) { return; @@ -650,7 +784,7 @@ public class DictionaryActivity extends ListActivity { } } else { // Down - destIndexEntry = Math.min(tokenRow.referenceIndex + 1, index.sortedIndexEntries.size()); + destIndexEntry = Math.min(tokenRow.referenceIndex + 1, index.sortedIndexEntries.size() - 1); } final Index.IndexEntry dest = index.sortedIndexEntries.get(destIndexEntry); Log.d(LOG, "onUpDownButton, destIndexEntry=" + dest.token); @@ -659,6 +793,14 @@ public class DictionaryActivity extends ListActivity { defocusSearchText(); } + void onRandomWordButton() { + int destIndexEntry = rand.nextInt(index.sortedIndexEntries.size()); + final Index.IndexEntry dest = index.sortedIndexEntries.get(destIndexEntry); + setSearchText(dest.token, false); + jumpToRow(index.sortedIndexEntries.get(destIndexEntry).startRow); + defocusSearchText(); + } + // -------------------------------------------------------------------------- // Options Menu // -------------------------------------------------------------------------- @@ -667,25 +809,51 @@ public class DictionaryActivity extends ListActivity { @Override public boolean onCreateOptionsMenu(final Menu menu) { - application.onCreateGlobalOptionsMenu(this, menu); -// { -// final MenuItem randomWord = menu.add(getString(R.string.randomWord)); -// randomWord.setOnMenuItemClickListener(new OnMenuItemClickListener() { -// public boolean onMenuItemClick(final MenuItem menuItem) { -// final String word = index.sortedIndexEntries.get(random -// .nextInt(index.sortedIndexEntries.size())).token; -// setSearchText(word, true); -// return false; -// } -// }); -// } + if (PreferenceManager.getDefaultSharedPreferences(this) + .getBoolean(getString(R.string.showPrevNextButtonsKey), true)) { + // Next word. + nextWordMenuItem = menu.add(getString(R.string.nextWord)) + .setIcon(R.drawable.arrow_down_float); + MenuItemCompat.setShowAsAction(nextWordMenuItem, MenuItem.SHOW_AS_ACTION_IF_ROOM); + nextWordMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + onUpDownButton(false); + return true; + } + }); + + // Previous word. + previousWordMenuItem = menu.add(getString(R.string.previousWord)) + .setIcon(R.drawable.arrow_up_float); + MenuItemCompat.setShowAsAction(previousWordMenuItem, MenuItem.SHOW_AS_ACTION_IF_ROOM); + previousWordMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + onUpDownButton(true); + return true; + } + }); + } + + randomWordMenuItem = menu.add(getString(R.string.randomWord)); + randomWordMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + onRandomWordButton(); + return true; + } + }); + + application.onCreateGlobalOptionsMenu(this, menu); { - final MenuItem dictionaryList = menu.add(getString(R.string.dictionaryManager)); - dictionaryList.setOnMenuItemClickListener(new OnMenuItemClickListener() { + final MenuItem dictionaryManager = menu.add(getString(R.string.dictionaryManager)); + MenuItemCompat.setShowAsAction(dictionaryManager, MenuItem.SHOW_AS_ACTION_NEVER); + dictionaryManager.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(final MenuItem menuItem) { - startActivity(DictionaryManagerActivity.getLaunchIntent()); + startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext())); finish(); return false; } @@ -694,6 +862,7 @@ public class DictionaryActivity extends ListActivity { { final MenuItem aboutDictionary = menu.add(getString(R.string.aboutDictionary)); + MenuItemCompat.setShowAsAction(aboutDictionary, MenuItem.SHOW_AS_ACTION_NEVER); aboutDictionary.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(final MenuItem menuItem) { final Context context = getListView().getContext(); @@ -733,9 +902,6 @@ public class DictionaryActivity extends ListActivity { source.getNumEntries())).append("\n"); } } - // } else { - // builder.append(getString(R.string.invalidDictionary)); - // } textView.setText(builder.toString()); dialog.show(); @@ -760,18 +926,33 @@ public class DictionaryActivity extends ListActivity { AdapterContextMenuInfo adapterContextMenuInfo = (AdapterContextMenuInfo) menuInfo; final RowBase row = (RowBase) getListAdapter().getItem(adapterContextMenuInfo.position); - final MenuItem addToWordlist = menu.add(getString(R.string.addToWordList, + final android.view.MenuItem addToWordlist = menu.add(getString(R.string.addToWordList, wordList.getName())); - addToWordlist.setOnMenuItemClickListener(new OnMenuItemClickListener() { - public boolean onMenuItemClick(MenuItem item) { - onAppendToWordList(row); + addToWordlist + .setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() { + public boolean onMenuItemClick(android.view.MenuItem item) { + onAppendToWordList(row); + return false; + } + }); + + final android.view.MenuItem share = menu.add("Share"); + share.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() { + public boolean onMenuItemClick(android.view.MenuItem item) { + Intent shareIntent = new Intent(android.content.Intent.ACTION_SEND); + shareIntent.setType("text/plain"); + shareIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, row.getTokenRow(true) + .getToken()); + shareIntent.putExtra(android.content.Intent.EXTRA_TEXT, + row.getRawText(saveOnlyFirstSubentry)); + startActivity(shareIntent); return false; } }); - final MenuItem copy = menu.add(android.R.string.copy); - copy.setOnMenuItemClickListener(new OnMenuItemClickListener() { - public boolean onMenuItemClick(MenuItem item) { + final android.view.MenuItem copy = menu.add(android.R.string.copy); + copy.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() { + public boolean onMenuItemClick(android.view.MenuItem item) { onCopy(row); return false; } @@ -779,21 +960,25 @@ public class DictionaryActivity extends ListActivity { if (selectedSpannableText != null) { final String selectedText = selectedSpannableText; - final MenuItem searchForSelection = menu.add(getString(R.string.searchForSelection, + final android.view.MenuItem searchForSelection = menu.add(getString( + R.string.searchForSelection, selectedSpannableText)); - searchForSelection.setOnMenuItemClickListener(new OnMenuItemClickListener() { - public boolean onMenuItemClick(MenuItem item) { - jumpToTextFromHyperLink(selectedText, selectedSpannableIndex); - return false; - } - }); + searchForSelection + .setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() { + public boolean onMenuItemClick(android.view.MenuItem item) { + jumpToTextFromHyperLink(selectedText, selectedSpannableIndex); + return false; + } + }); + // Rats, this won't be shown: + //searchForSelection.setIcon(R.drawable.abs__ic_search); } if (row instanceof TokenRow && ttsReady) { - final MenuItem speak = menu.add(R.string.speak); - speak.setOnMenuItemClickListener(new OnMenuItemClickListener() { + final android.view.MenuItem speak = menu.add(R.string.speak); + speak.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() { @Override - public boolean onMenuItemClick(MenuItem item) { + public boolean onMenuItemClick(android.view.MenuItem item) { textToSpeech.speak(((TokenRow) row).getToken(), TextToSpeech.QUEUE_FLUSH, new HashMap()); return false; @@ -802,7 +987,8 @@ public class DictionaryActivity extends ListActivity { } } - private void jumpToTextFromHyperLink(final String selectedText, final int defaultIndexToUse) { + private void jumpToTextFromHyperLink( + final String selectedText, final int defaultIndexToUse) { int indexToUse = -1; for (int i = 0; i < dictionary.indices.size(); ++i) { final Index index = dictionary.indices.get(i); @@ -824,16 +1010,32 @@ public class DictionaryActivity extends ListActivity { if (indexToUse == -1) { indexToUse = defaultIndexToUse; } - final boolean changeIndex = indexIndex != indexToUse; - if (changeIndex) { - setSearchText(selectedText, false); - changeIndexAndResearch(indexToUse); - } else { - setSearchText(selectedText, true); - } + // Without this extra delay, the call to jumpToRow that this + // invokes doesn't always actually have any effect. + final int actualIndexToUse = indexToUse; + getListView().postDelayed(new Runnable() { + @Override + public void run() { + setIndexAndSearchText(actualIndexToUse, selectedText); + } + }, 100); + } + + /** + * Called when user clicks outside of search text, so that they can start + * typing again immediately. + */ + void defocusSearchText() { + // Log.d(LOG, "defocusSearchText"); + // Request focus so that if we start typing again, it clears the text + // input. + getListView().requestFocus(); + + // Visual indication that a new keystroke will clear the search text. + // Doesn't seem to work unless searchText has focus. + // searchView.selectAll(); } - @Override protected void onListItemClick(ListView l, View v, int row, long id) { defocusSearchText(); if (clickOpensContextMenu && dictRaf != null) { @@ -841,6 +1043,7 @@ public class DictionaryActivity extends ListActivity { } } + @SuppressLint("SimpleDateFormat") void onAppendToWordList(final RowBase row) { defocusSearchText(); @@ -856,7 +1059,7 @@ public class DictionaryActivity extends ListActivity { final PrintWriter out = new PrintWriter(new FileWriter(wordList, true)); out.println(rawText.toString()); out.close(); - } catch (IOException e) { + } catch (Exception e) { Log.e(LOG, "Unable to append to " + wordList.getAbsolutePath(), e); Toast.makeText(this, getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()), @@ -865,21 +1068,6 @@ public class DictionaryActivity extends ListActivity { return; } - /** - * Called when user clicks outside of search text, so that they can start - * typing again immediately. - */ - void defocusSearchText() { - // Log.d(LOG, "defocusSearchText"); - // Request focus so that if we start typing again, it clears the text - // input. - getListView().requestFocus(); - - // Visual indication that a new keystroke will clear the search text. - // Doesn't seem to work unless earchText has focus. - // searchText.selectAll(); - } - @SuppressWarnings("deprecation") void onCopy(final RowBase row) { defocusSearchText(); @@ -895,8 +1083,9 @@ public class DictionaryActivity extends ListActivity { @Override public boolean onKeyDown(final int keyCode, final KeyEvent event) { if (event.getUnicodeChar() != 0) { - if (!searchText.hasFocus()) { + if (!searchView.hasFocus()) { setSearchText("" + (char) event.getUnicodeChar(), true); + searchView.requestFocus(); } return true; } @@ -916,34 +1105,60 @@ public class DictionaryActivity extends ListActivity { return super.onKeyDown(keyCode, event); } - private void setSearchText(final String text, final boolean triggerSearch) { - if (!triggerSearch) { - getListView().requestFocus(); + private void setIndexAndSearchText(int newIndex, String newSearchText) { + Log.d(LOG, "Changing index to: " + newIndex); + if (newIndex == -1) { + Log.e(LOG, "Invalid index."); + newIndex = 0; } - searchText.setText(text); - searchText.requestFocus(); + if (newIndex != indexIndex) { + indexIndex = newIndex; + index = dictionary.indices.get(indexIndex); + indexAdapter = new IndexAdapter(index); + setListAdapter(indexAdapter); + Log.d(LOG, "changingIndex, newLang=" + index.longName); + setDictionaryPrefs(this, dictFile, index.shortName, searchView.getQuery().toString()); + updateLangButton(); + } + setSearchText(newSearchText, true); + } + + private void setSearchText(final String text, final boolean triggerSearch) { + Log.d(LOG, "setSearchText, text=" + text + ", triggerSearch=" + triggerSearch); + // Disable the listener, because sometimes it doesn't work. + searchView.setOnQueryTextListener(null); + searchView.setQuery(text, false); moveCursorToRight(); + searchView.setOnQueryTextListener(onQueryTextListener); + + // Hide search icon once text is entered + searchView.setIconifiedByDefault(text.length() > 0); + searchView.setIconified(false); + + // We don't want to show virtual keyboard when we're changing searchView text programatically: + hideKeyboard(); + if (triggerSearch) { - onSearchTextChange(text); + onQueryTextListener.onQueryTextChange(text); } } - private long cursorDelayMillis = 100; - + // private long cursorDelayMillis = 100; private void moveCursorToRight() { - if (searchText.getLayout() != null) { - cursorDelayMillis = 100; - // Surprising, but this can crash when you rotate... - Selection.moveToRightEdge(searchText.getText(), searchText.getLayout()); - } else { - uiHandler.postDelayed(new Runnable() { - @Override - public void run() { - moveCursorToRight(); - } - }, cursorDelayMillis); - cursorDelayMillis = Math.min(10 * 1000, 2 * cursorDelayMillis); - } + // if (searchText.getLayout() != null) { + // cursorDelayMillis = 100; + // // Surprising, but this can crash when you rotate... + // Selection.moveToRightEdge(searchView.getQuery(), + // searchText.getLayout()); + // } else { + // uiHandler.postDelayed(new Runnable() { + // @Override + // public void run() { + // moveCursorToRight(); + // } + // }, cursorDelayMillis); + // cursorDelayMillis = Math.min(10 * 1000, 2 * cursorDelayMillis); + // } } // -------------------------------------------------------------------------- @@ -987,15 +1202,10 @@ public class DictionaryActivity extends ListActivity { } private final void jumpToRow(final int row) { - final boolean refocusSearchText = searchText.hasFocus(); - Log.d(LOG, "jumpToRow: " + row + ", refocusSearchText=" + refocusSearchText); - getListView().requestFocusFromTouch(); + Log.d(LOG, "jumpToRow: " + row + ", refocusSearchText=" + false); + // getListView().requestFocusFromTouch(); getListView().setSelectionFromTop(row, 0); getListView().setSelected(true); - if (refocusSearchText) { - searchText.requestFocus(); - } - //Log.d(LOG, "getSelectedItemPosition():" + getSelectedItemPosition()); } static final Pattern WHITESPACE = Pattern.compile("\\s+"); @@ -1019,7 +1229,7 @@ public class DictionaryActivity extends ListActivity { boolean done = false; SearchOperation(final String searchText, final Index index) { - this.searchText = searchText.trim(); + this.searchText = StringUtil.normalizeWhitespace(searchText); this.index = index; } @@ -1036,7 +1246,8 @@ public class DictionaryActivity extends ListActivity { searchResult = index.findInsertionPoint(searchText, interrupted); } else { searchTokens = Arrays.asList(searchTokenArray); - multiWordSearchResult = index.multiWordSearch(searchTokens, interrupted); + multiWordSearchResult = index.multiWordSearch(searchText, searchTokens, + interrupted); } Log.d(LOG, "searchText=" + searchText + ", searchDuration=" @@ -1229,7 +1440,10 @@ public class DictionaryActivity extends ListActivity { result.setClickable(true); result.setFocusable(true); result.setLongClickable(true); - result.setBackgroundResource(android.R.drawable.menuitem_background); +// result.setBackgroundResource(android.R.drawable.menuitem_background); + + result.setBackgroundResource(theme.normalRowBg); + result.setOnClickListener(new TextView.OnClickListener() { @Override public void onClick(View v) { @@ -1263,7 +1477,7 @@ public class DictionaryActivity extends ListActivity { 0); textView.setOnLongClickListener(textViewLongClickListenerIndex0); result.setLongClickable(true); - + // Doesn't work: // textView.setTextColor(android.R.color.secondary_text_light); textView.setTypeface(typeface); @@ -1285,16 +1499,18 @@ public class DictionaryActivity extends ListActivity { public void onClick(View widget) { } }; - ((Spannable) textView.getText()).setSpan(clickableSpan, 0, text.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE); + ((Spannable) textView.getText()).setSpan(clickableSpan, 0, text.length(), + Spannable.SPAN_INCLUSIVE_INCLUSIVE); result.setClickable(true); textView.setClickable(true); textView.setMovementMethod(LinkMovementMethod.getInstance()); textView.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - final String html = HtmlEntry.htmlBody(htmlEntries, index.shortName); + String html = HtmlEntry.htmlBody(htmlEntries, index.shortName); + // Log.d(LOG, "html=" + html); startActivityForResult( - HtmlDisplayActivity.getHtmlIntent(String.format( + HtmlDisplayActivity.getHtmlIntent(getApplicationContext(), String.format( "%s", html), htmlTextToHighlight, false), 0); @@ -1330,7 +1546,8 @@ public class DictionaryActivity extends ListActivity { textView.setMovementMethod(LinkMovementMethod.getInstance()); final Matcher matcher = CHAR_DASH.matcher(text); while (matcher.find()) { - spannable.setSpan(new NonLinkClickableSpan(), matcher.start(), matcher.end(), + spannable.setSpan(new NonLinkClickableSpan(textColorFg), matcher.start(), + matcher.end(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE); } } @@ -1396,10 +1613,15 @@ public class DictionaryActivity extends ListActivity { Log.d(LOG, "searchText changed during shutdown, doing nothing."); return; } - if (!searchText.isFocused()) { - Log.d(LOG, "searchText changed without focus, doing nothing."); - return; - } + + // Hide search icon once text is entered + searchView.setIconifiedByDefault(text.length() > 0); + searchView.setIconified(false); + + // if (!searchView.hasFocus()) { + // Log.d(LOG, "searchText changed without focus, doing nothing."); + // return; + // } Log.d(LOG, "onSearchTextChange: " + text); if (currentSearchOperation != null) { Log.d(LOG, "Interrupting currentSearchOperation."); @@ -1409,22 +1631,6 @@ public class DictionaryActivity extends ListActivity { searchExecutor.execute(currentSearchOperation); } - private class SearchTextWatcher implements TextWatcher { - public void afterTextChanged(final Editable searchTextEditable) { - if (searchText.hasFocus()) { - Log.d(LOG, "SearchTextWatcher: Search text changed with focus: " + searchText.getText()); - // If they were typing to cause the change, update the UI. - onSearchTextChange(searchText.getText().toString()); - } - } - - public void beforeTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) { - } - - public void onTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) { - } - } - // -------------------------------------------------------------------------- // Filtered results. // -------------------------------------------------------------------------- @@ -1434,15 +1640,19 @@ public class DictionaryActivity extends ListActivity { } void setFiltered(final SearchOperation searchOperation) { - ((ImageButton) findViewById(R.id.UpButton)).setEnabled(false); - ((ImageButton) findViewById(R.id.DownButton)).setEnabled(false); + if (nextWordMenuItem != null) { + nextWordMenuItem.setEnabled(false); + previousWordMenuItem.setEnabled(false); + } rowsToShow = searchOperation.multiWordSearchResult; setListAdapter(new IndexAdapter(index, rowsToShow, searchOperation.searchTokens)); } void clearFiltered() { - ((ImageButton) findViewById(R.id.UpButton)).setEnabled(true); - ((ImageButton) findViewById(R.id.DownButton)).setEnabled(true); + if (nextWordMenuItem != null) { + nextWordMenuItem.setEnabled(true); + previousWordMenuItem.setEnabled(true); + } setListAdapter(new IndexAdapter(index)); rowsToShow = null; }