import android.support.v7.widget.SearchView.OnQueryTextListener;
import android.support.v7.widget.Toolbar;
import android.text.ClipboardManager;
+import android.text.InputType;
import android.text.Spannable;
import android.text.method.LinkMovementMethod;
import android.text.style.ClickableSpan;
List<RowBase> rowsToShow = null; // if not null, just show these rows.
+ final Random rand = new Random();
+
final Handler uiHandler = new Handler();
private final Executor searchExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
ImageButton languageButton;
SearchView.OnQueryTextListener onQueryTextListener;
- MenuItem nextWordMenuItem, previousWordMenuItem;
+ MenuItem nextWordMenuItem, previousWordMenuItem, randomWordMenuItem;
// Never null.
private File wordList = null;
@Override
public void onInit(int status) {
ttsReady = true;
- updateTTSLanguage();
+ updateTTSLanguage(indexIndex);
}
});
for (final Index index : dictionary.indices) {
final String searchToken = index.sortedIndexEntries.get(0).token;
final IndexEntry entry = index.findExact(searchToken);
- if (!searchToken.equals(entry.token)) {
- Log.e(LOG, "Couldn't find token: " + searchToken + ", " + entry.token);
+ if (entry == null || !searchToken.equals(entry.token)) {
+ Log.e(LOG, "Couldn't find token: " + searchToken + ", " + (entry == null ? "null" : entry.token));
}
}
indexPrepFinished = true;
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);
// wrong place.
searchView.setQueryHint(getString(R.string.searchText));
searchView.setSubmitButtonEnabled(false);
+ searchView.setInputType(InputType.TYPE_CLASS_TEXT);
searchView.setImeOptions(
- EditorInfo.IME_ACTION_SEARCH |
+ EditorInfo.IME_ACTION_DONE |
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());
+ hideKeyboard();
return true;
}
}
}
+ 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 =
DictionaryApplication.isoCodeToResources.get(index.shortName);
languageButton.setImageResource(android.R.drawable.ic_media_previous);
}
}
- updateTTSLanguage();
+ updateTTSLanguage(indexIndex);
}
- private void updateTTSLanguage() {
+ private void updateTTSLanguage(int i) {
if (!ttsReady || index == null || textToSpeech == null) {
Log.d(LOG, "Can't updateTTSLanguage.");
return;
}
- final Locale locale = new Locale(index.sortLanguage.getIsoCode());
+ final Locale locale = new Locale(dictionary.indices.get(i).sortLanguage.getIsoCode());
Log.d(LOG, "Setting TTS locale to: " + locale);
+ try {
final int ttsResult = textToSpeech.setLanguage(locale);
- if (ttsResult != TextToSpeech.LANG_AVAILABLE ||
+ if (ttsResult != TextToSpeech.LANG_AVAILABLE &&
ttsResult != TextToSpeech.LANG_COUNTRY_AVAILABLE) {
Log.e(LOG, "TTS not available in this language: ttsResult=" + ttsResult);
}
+ } catch (Exception e) {
+ Toast.makeText(this, getString(R.string.TTSbroken), Toast.LENGTH_LONG).show();
+ }
}
void onLanguageButtonClick() {
final IndexInfo indexInfo = dictionaryInfo.indexInfos.get(i);
final View button = application.createButton(parent.getContext(),
dictionaryInfo, indexInfo);
- button.setLayoutParams(new LinearLayout.LayoutParams(application.languageButtonPixels, application.languageButtonPixels * 2 / 3));
final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(),
getLaunchIntent(getApplicationContext(),
application.getPath(dictionaryInfo.uncompressedFilename),
}
};
button.setOnClickListener(intentLauncher);
+ if (i == indexIndex && dictFile != null &&
+ dictFile.getName().equals(dictionaryInfo.uncompressedFilename)) {
+ button.setPressed(true);
+ }
result.addView(button);
}
}
} 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);
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
// --------------------------------------------------------------------------
});
}
+ randomWordMenuItem = menu.add(getString(R.string.randomWord));
+ randomWordMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ onRandomWordButton();
+ return true;
+ }
+ });
+
application.onCreateGlobalOptionsMenu(this, menu);
{
//searchForSelection.setIcon(R.drawable.abs__ic_search);
}
- if (row instanceof TokenRow && ttsReady) {
+ if ((row instanceof TokenRow || selectedSpannableText != null) && ttsReady) {
final android.view.MenuItem speak = menu.add(R.string.speak);
+ final String textToSpeak = row instanceof TokenRow ? ((TokenRow) row).getToken() : selectedSpannableText;
+ updateTTSLanguage(row instanceof TokenRow ? indexIndex : selectedSpannableIndex);
speak.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(android.view.MenuItem item) {
- textToSpeech.speak(((TokenRow) row).getToken(), TextToSpeech.QUEUE_FLUSH,
+ textToSpeech.speak(textToSpeak, TextToSpeech.QUEUE_FLUSH,
new HashMap<String, String>());
return false;
}
private void jumpToTextFromHyperLink(
final String selectedText, final int defaultIndexToUse) {
int indexToUse = -1;
+ int numFound = 0;
for (int i = 0; i < dictionary.indices.size(); ++i) {
final Index index = dictionary.indices.get(i);
if (indexPrepFinished) {
.getTokenRow(false);
if (tokenRow != null && tokenRow.hasMainEntry) {
indexToUse = i;
- break;
+ ++numFound;
}
}
} else {
Log.w(LOG, "Skipping findExact on index " + index.shortName);
}
}
- if (indexToUse == -1) {
+ if (numFound != 1 || indexToUse == -1) {
indexToUse = defaultIndexToUse;
}
// Without this extra delay, the call to jumpToRow that this
getListView().requestFocus();
// Visual indication that a new keystroke will clear the search text.
- // Doesn't seem to work unless earchText has focus.
+ // Doesn't seem to work unless searchText has focus.
// searchView.selectAll();
}
if (keyCode == KeyEvent.KEYCODE_ENTER) {
Log.d(LOG, "Trying to hide soft keyboard.");
final InputMethodManager inputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
- inputManager.hideSoftInputFromWindow(this.getCurrentFocus().getWindowToken(),
- InputMethodManager.HIDE_NOT_ALWAYS);
+ View focus = getCurrentFocus();
+ if (focus != null) {
+ inputManager.hideSoftInputFromWindow(focus.getWindowToken(),
+ InputMethodManager.HIDE_NOT_ALWAYS);
+ }
return true;
}
return super.onKeyDown(keyCode, event);
searchView.setIconified(false);
if (triggerSearch) {
- onQueryTextListener.onQueryTextChange(text);
+ onSearchTextChange(text);
}
+
+ // We don't want to show virtual keyboard when we're changing searchView text programatically:
+ hideKeyboard();
}
// private long cursorDelayMillis = 100;
final TextView textView = new TextView(context);
textView.setText(text, BufferType.SPANNABLE);
createTokenLinkSpans(textView, (Spannable) textView.getText(), text);
- final TextViewLongClickListener textViewLongClickListenerIndex0 = new TextViewLongClickListener(
- 0);
- textView.setOnLongClickListener(textViewLongClickListenerIndex0);
+ textView.setOnLongClickListener(indexIndex > 0 ? textViewLongClickListenerIndex1 : textViewLongClickListenerIndex0);
result.setLongClickable(true);
// Doesn't work:
projects / Dictionary.git / blobdiff