X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryActivity.java;h=4425a0b0f3d7cc2276ba5679d7df7e956b68ef20;hb=ff02b5a75fbda3571ec0f632e2d046db915a02fc;hp=fe0e57fb2243c767e8d62b18cba48fabd301bc64;hpb=0c24438a58327fedcb69eba60c2985decceccf72;p=Dictionary.git diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java index fe0e57f..4425a0b 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,8 +14,9 @@ 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; @@ -28,10 +29,7 @@ import android.preference.PreferenceManager; import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech.OnInitListener; 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; @@ -40,22 +38,18 @@ import android.util.TypedValue; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.KeyEvent; -import android.view.Menu; -import android.view.MenuItem; -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.AdapterContextMenuInfo; import android.widget.BaseAdapter; import android.widget.Button; -import android.widget.EditText; -import android.widget.ImageButton; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ListAdapter; @@ -66,12 +60,21 @@ import android.widget.TextView; import android.widget.TextView.BufferType; import android.widget.Toast; +import com.actionbarsherlock.app.ActionBar; +import com.actionbarsherlock.app.SherlockListActivity; +import com.actionbarsherlock.view.Menu; +import com.actionbarsherlock.view.MenuItem; +import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener; +import com.actionbarsherlock.widget.SearchView; +import com.actionbarsherlock.widget.SearchView.OnQueryTextListener; import com.hughes.android.dictionary.DictionaryInfo.IndexInfo; import com.hughes.android.dictionary.engine.Dictionary; 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; +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; @@ -103,14 +106,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 SherlockListActivity { static final String LOG = "QuickDic"; DictionaryApplication application; File dictFile = null; - RandomAccessFile dictRaf = null; Dictionary dictionary = null; @@ -121,15 +123,8 @@ public class DictionaryActivity extends ListActivity { List rowsToShow = null; // if not null, just show these rows. - // package for test. final Handler uiHandler = new Handler(); - - TextToSpeech textToSpeech; - volatile boolean ttsReady; - - int textColorFg = Color.BLACK; - private final Executor searchExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() { @Override public Thread newThread(Runnable r) { @@ -139,28 +134,28 @@ public class DictionaryActivity extends ListActivity { private SearchOperation currentSearchOperation = null; - C.Theme theme = C.Theme.LIGHT; + TextToSpeech textToSpeech; + volatile boolean ttsReady; Typeface typeface; - + C.Theme theme = C.Theme.LIGHT; + int textColorFg = Color.BLACK; int fontSizeSp; - EditText searchText; + SearchView searchView; + ImageView searchHintIcon; + SearchView.OnQueryTextListener onQueryTextListener; - Button langButton; + MenuItem nextWordMenuItem, previousWordMenuItem; // 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 @@ -171,56 +166,141 @@ public class DictionaryActivity extends ListActivity { public DictionaryActivity() { } - public static Intent getLaunchIntent(final File dictFile, final int indexIndex, + public static Intent getLaunchIntent(final File dictFile, final String indexShortName, final String searchToken) { final Intent intent = new Intent(); intent.setClassName(DictionaryActivity.class.getPackage().getName(), DictionaryActivity.class.getName()); 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; } @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()); + super.onSaveInstanceState(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 - protected void onRestoreInstanceState(final Bundle outState) { - super.onRestoreInstanceState(outState); - Log.d(LOG, "onRestoreInstanceState: " + outState.getString(C.SEARCH_TOKEN)); - onCreate(outState); + protected void onRestoreInstanceState(final Bundle savedInstanceState) { + super.onRestoreInstanceState(savedInstanceState); + Log.d(LOG, "onRestoreInstanceState: " + savedInstanceState.getString(C.SEARCH_TOKEN)); + onCreate(savedInstanceState); } @Override public void onCreate(Bundle savedInstanceState) { + Log.d(LOG, "onCreate:" + this); + super.onCreate(savedInstanceState); + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - prefs.edit().remove(C.INDEX_INDEX).commit(); // Don't auto-launch if - // this fails. + + // Don't auto-launch if this fails. + prefs.edit().remove(C.DICT_FILE).commit(); setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId); - Log.d(LOG, "onCreate:" + this); - super.onCreate(savedInstanceState); - 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()); + 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(); } }); @@ -245,11 +325,17 @@ public class DictionaryActivity extends ListActivity { 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)); @@ -265,7 +351,7 @@ public class DictionaryActivity extends ListActivity { uiHandler.post(new Runnable() { @Override public void run() { - onSearchTextChange(searchText.getText().toString()); + onSearchTextChange(searchView.getQuery().toString()); } }); } @@ -299,10 +385,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; @@ -315,16 +397,21 @@ public class DictionaryActivity extends ListActivity { } 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 = new File(prefs.getString(getString(R.string.wordListFileKey), + new File(application.getDictDir(), "wordList.txt").getAbsolutePath())); + 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); if (savedInstanceState != null) { @@ -336,86 +423,66 @@ 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(); - } - }); - 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(); + setDictionaryPrefs(this, dictFile, index.shortName, searchView.getQuery().toString()); + + updateLangButton(); + } + + private void onCreateSetupActionBarAndSearchView() { + ActionBar actionBar = getSupportActionBar(); + actionBar.setDisplayShowTitleEnabled(false); + + 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); + final int width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 300, + getResources().getDisplayMetrics()); + FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(width, + FrameLayout.LayoutParams.WRAP_CONTENT); + searchView.setLayoutParams(lp); + 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; } - }); - langButton.setOnLongClickListener(new OnLongClickListener() { + @Override - public boolean onLongClick(View v) { - onLanguageButtonLongClick(v.getContext()); + public boolean onQueryTextChange(String newText) { + Log.d(LOG, "OnQueryTextListener: onQueryTextChange: " + searchView.getQuery()); + onSearchTextChange(searchView.getQuery().toString()); return true; } - }); - updateLangButton(); + }; + searchView.setOnQueryTextListener(onQueryTextListener); - final View upButton = findViewById(R.id.UpButton); - upButton.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - onUpDownButton(true); + searchHintIcon = (ImageView) searchView.findViewById(R.id.abs__search_mag_icon); + searchHintIcon.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View arg0) { + onLanguageButtonClick(); } }); - final View downButton = findViewById(R.id.DownButton); - downButton.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - onUpDownButton(false); + searchHintIcon.setOnLongClickListener(new OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + onLanguageButtonLongClick(v.getContext()); + return true; } }); - upButton.setVisibility(PreferenceManager.getDefaultSharedPreferences(this) - .getBoolean(getString(R.string.showPrevNextButtonsKey), true) ? View.VISIBLE - : View.GONE); - downButton.setVisibility(PreferenceManager.getDefaultSharedPreferences(this) - .getBoolean(getString(R.string.showPrevNextButtonsKey), true) ? View.VISIBLE - : View.GONE); - -// 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()); + actionBar.setCustomView(searchView); + actionBar.setDisplayShowCustomEnabled(true); } @Override @@ -436,6 +503,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)) { @@ -445,11 +516,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(); } @@ -484,40 +555,37 @@ public class DictionaryActivity extends ListActivity { // Buttons // -------------------------------------------------------------------------- - private void onClearSearchTextButton() { - setSearchText("", true); - showKeyboard(); - } - private void showKeyboard() { - searchText.postDelayed(new Runnable() { - @Override - public void run() { - Log.d(LOG, "Trying to show soft keyboard."); - final boolean searchTextHadFocus = searchText.hasFocus(); - searchText.requestFocus(); - final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT); - if (!searchTextHadFocus) { - defocusSearchText(); - } - }}, 100); +// searchText.postDelayed(new Runnable() { +// @Override +// public void run() { +// Log.d(LOG, "Trying to show soft keyboard."); +// final boolean searchTextHadFocus = searchText.hasFocus(); +// searchText.requestFocus(); +// final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); +// manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT); +// if (!searchTextHadFocus) { +// defocusSearchText(); +// } +// }}, 100); } 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 = + Language.isoCodeToResources.get(index.shortName); + if (languageResources != null && languageResources.flagId != 0) { + searchHintIcon.setImageResource(languageResources.flagId); + } else { + if (indexIndex % 2 == 0) { + searchHintIcon.setImageResource(android.R.drawable.ic_media_next); + } else { + searchHintIcon.setImageResource(android.R.drawable.ic_media_previous); + } + } + updateTTSLanguage(); + } - private void updateTTSLanuage() { + private void updateTTSLanguage() { if (!ttsReady || index == null || textToSpeech == null) { Log.d(LOG, "Can't updateTTSLanguage."); return; @@ -531,12 +599,12 @@ public class DictionaryActivity extends ListActivity { } } - void onLanguageButton() { + void onLanguageButtonClick() { 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) { @@ -544,17 +612,9 @@ 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); @@ -567,9 +627,7 @@ public class DictionaryActivity extends ListActivity { }; }; button.setOnClickListener(intentLauncher); - // button.setLayoutParams(layoutParams); listView.addHeaderView(button); - // listView.setHeaderDividersEnabled(true); listView.setAdapter(new BaseAdapter() { @Override @@ -579,19 +637,12 @@ 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( application.getPath(dictionaryInfo.uncompressedFilename), - i, searchText.getText().toString())) { + indexInfo.shortName, searchView.getQuery().toString())) { @Override protected void onGo() { dialog.dismiss(); @@ -600,7 +651,6 @@ public class DictionaryActivity extends ListActivity { }; button.setOnClickListener(intentLauncher); result.addView(button); - } final TextView nameView = new TextView(parent.getContext()); @@ -613,7 +663,6 @@ public class DictionaryActivity extends ListActivity { layoutParams.weight = 1.0f; nameView.setLayoutParams(layoutParams); result.addView(nameView); - return result; } @@ -632,26 +681,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; @@ -682,25 +714,42 @@ public class DictionaryActivity extends ListActivity { // -------------------------------------------------------------------------- final Random random = new Random(); - + @Override public boolean onCreateOptionsMenu(final Menu menu) { - application.onCreateGlobalOptionsMenu(this, menu); + + 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); + nextWordMenuItem.setShowAsAction(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); + previousWordMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + previousWordMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + onUpDownButton(true); + return true; + } + }); + } -// { -// 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; -// } -// }); -// } + application.onCreateGlobalOptionsMenu(this, menu); { final MenuItem dictionaryList = menu.add(getString(R.string.dictionaryManager)); + dictionaryList.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); dictionaryList.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(final MenuItem menuItem) { startActivity(DictionaryManagerActivity.getLaunchIntent()); @@ -712,6 +761,7 @@ public class DictionaryActivity extends ListActivity { { final MenuItem aboutDictionary = menu.add(getString(R.string.aboutDictionary)); + aboutDictionary.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); aboutDictionary.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(final MenuItem menuItem) { final Context context = getListView().getContext(); @@ -751,9 +801,6 @@ public class DictionaryActivity extends ListActivity { source.getNumEntries())).append("\n"); } } - // } else { - // builder.append(getString(R.string.invalidDictionary)); - // } textView.setText(builder.toString()); dialog.show(); @@ -778,18 +825,30 @@ 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) { + addToWordlist.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() { + public boolean onMenuItemClick(android.view.MenuItem item) { onAppendToWordList(row); return false; } }); - final MenuItem copy = menu.add(android.R.string.copy); - copy.setOnMenuItemClickListener(new OnMenuItemClickListener() { - public boolean onMenuItemClick(MenuItem item) { + 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 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; } @@ -797,10 +856,10 @@ 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) { + searchForSelection.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() { + public boolean onMenuItemClick(android.view.MenuItem item) { jumpToTextFromHyperLink(selectedText, selectedSpannableIndex); return false; } @@ -808,10 +867,10 @@ public class DictionaryActivity extends ListActivity { } 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; @@ -820,7 +879,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); @@ -842,13 +902,22 @@ 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); - } + setIndexAndSearchText(indexToUse, selectedText); + } + + /** + * 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. +// searchView.selectAll(); } @Override @@ -859,6 +928,7 @@ public class DictionaryActivity extends ListActivity { } } + @SuppressLint("SimpleDateFormat") void onAppendToWordList(final RowBase row) { defocusSearchText(); @@ -883,21 +953,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(); @@ -913,9 +968,10 @@ 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; } if (keyCode == KeyEvent.KEYCODE_BACK) { @@ -933,35 +989,53 @@ public class DictionaryActivity extends ListActivity { } return super.onKeyDown(keyCode, event); } + + private void setIndexAndSearchText(int newIndex, String newSearchText) { + Log.d(LOG, "Changing index to: " + newIndex); + if (newIndex == -1) { + Log.e(LOG, "Invalid index."); + newIndex = 0; + } + 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) { if (!triggerSearch) { - getListView().requestFocus(); + searchView.setOnQueryTextListener(null); } - searchText.setText(text); - searchText.requestFocus(); + searchView.setQuery(text, false); moveCursorToRight(); - if (triggerSearch) { - onSearchTextChange(text); + if (!triggerSearch) { + searchView.setOnQueryTextListener(onQueryTextListener); + } else { + 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); +// } } // -------------------------------------------------------------------------- @@ -1005,15 +1079,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+"); @@ -1415,10 +1484,10 @@ 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; - } +// 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."); @@ -1428,22 +1497,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. // -------------------------------------------------------------------------- @@ -1453,15 +1506,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; }