import android.preference.PreferenceManager;
import android.speech.tts.TextToSpeech;
import android.speech.tts.TextToSpeech.OnInitListener;
+import android.support.design.widget.FloatingActionButton;
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.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;
outState.putString(C.SEARCH_TOKEN, searchView.getQuery().toString());
}
+ private int getMatchLen(String search, Index.IndexEntry e)
+ {
+ if (e == null) return 0;
+ for (int i = 0; i < search.length(); ++i)
+ {
+ String a = search.substring(0, i + 1);
+ String b = e.token.substring(0, i + 1);
+ if (!a.equalsIgnoreCase(b))
+ return i;
+ }
+ return search.length();
+ }
+
@Override
public void onCreate(Bundle savedInstanceState) {
// This needs to be before super.onCreate, otherwise ActionbarSherlock
if (query != null)
getIntent().putExtra(C.SEARCH_TOKEN, query);
}
+ if (intentAction != null && intentAction.equals(Intent.ACTION_SEND))
+ {
+ String query = intent.getStringExtra(Intent.EXTRA_TEXT);
+ if (query != null)
+ getIntent().putExtra(C.SEARCH_TOKEN, query);
+ }
+ /*
+ * This processes text on M+ devices where QuickDic shows up in the context menu.
+ */
+ if (intentAction != null && intentAction.equals(Intent.ACTION_PROCESS_TEXT)) {
+ String query = intent.getStringExtra(Intent.EXTRA_PROCESS_TEXT);
+ 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
+ * fail (no default dictionary specified), show a toast and
* abort.
*/
if (intent.getStringExtra(C.DICT_FILE) == null)
intent.putExtra(C.DICT_FILE, application.getPath(dictfile).toString());
}
String dictFilename = intent.getStringExtra(C.DICT_FILE);
+ if (dictFilename == null && intent.getStringExtra(C.SEARCH_TOKEN) != null)
+ {
+ final List<DictionaryInfo> dics = application.getDictionariesOnDevice(null);
+ final String search = intent.getStringExtra(C.SEARCH_TOKEN);
+ String bestFname = null;
+ String bestIndex = null;
+ int bestMatchLen = 2; // ignore shorter matches
+ AtomicBoolean dummy = new AtomicBoolean();
+ for (int i = 0; dictFilename == null && i < dics.size(); ++i)
+ {
+ try {
+ final String fname = dics.get(i).uncompressedFilename;
+ Dictionary dic = new Dictionary(new RandomAccessFile(new File(fname), "r"));
+ for (int j = 0; j < dic.indices.size(); ++j) {
+ Index idx = dic.indices.get(j);
+ if (idx.findExact(search) != null)
+ {
+ dictFilename = fname;
+ intent.putExtra(C.INDEX_SHORT_NAME, idx.shortName);
+ break;
+ }
+ int matchLen = getMatchLen(search, idx.findInsertionPoint(search, dummy));
+ if (matchLen > bestMatchLen)
+ {
+ dictFilename = fname;
+ intent.putExtra(C.INDEX_SHORT_NAME, idx.shortName);
+ bestMatchLen = matchLen;
+ }
+ }
+ } catch (Exception e) {}
+ }
+ }
if (dictFilename == null)
{
@Override
public void onInit(int status) {
ttsReady = true;
- updateTTSLanguage();
+ updateTTSLanguage(indexIndex);
}
});
}
Log.d(LOG, "Loading index " + indexIndex);
index = dictionary.indices.get(indexIndex);
+ getListView().setEmptyView(findViewById(android.R.id.empty));
setListAdapter(new IndexAdapter(index));
// 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() {
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;
onCreateSetupActionBarAndSearchView();
+ View floatSwapButton = findViewById(R.id.floatSwapButton);
+ floatSwapButton.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View arg0) {
+ onLanguageButtonClick();
+ }
+ });
+ floatSwapButton.setOnLongClickListener(new OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View v) {
+ onLanguageButtonLongClick(v.getContext());
+ return true;
+ }
+ });
+
+ final FloatingActionButton floatSearchButton = (FloatingActionButton)findViewById(R.id.floatSearchButton);
+ floatSearchButton.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View arg0) {
+ if (!searchView.hasFocus()) {
+ searchView.requestFocus();
+ }
+ if (searchView.getQuery().toString().length() > 0) {
+ searchView.setQuery("", false);
+ }
+ showKeyboard();
+ searchView.setIconified(false);
+ }
+ });
+
// Set the search text from the intent, then the saved state.
String text = getIntent().getStringExtra(C.SEARCH_TOKEN);
if (savedInstanceState != null) {
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);
});
languageButton = new ImageButton(customSearchView.getContext());
- languageButton.setMinimumWidth(application.languageButtonPixels);
- languageButton.setMinimumHeight(application.languageButtonPixels * 2 / 3);
languageButton.setScaleType(ScaleType.FIT_CENTER);
languageButton.setOnClickListener(new OnClickListener() {
@Override
- public void onClick(View arg0) {
- onLanguageButtonClick();
- }
- });
- languageButton.setOnLongClickListener(new OnLongClickListener() {
- @Override
- public boolean onLongClick(View v) {
+ public void onClick(View v) {
onLanguageButtonLongClick(v.getContext());
- return true;
}
});
- customSearchView.addView(languageButton);
+ 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.
+
+ // Get rid of search icon, it takes up too much space.
+ // There is still text saying "search" in the search field.
+ searchView.setIconifiedByDefault(true);
+ searchView.setIconified(false);
+
searchView.setQueryHint(getString(R.string.searchText));
searchView.setSubmitButtonEnabled(false);
- LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(0,
- FrameLayout.LayoutParams.WRAP_CONTENT);
- lp.weight = 1;
- searchView.setLayoutParams(lp);
+ 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;
}
};
searchView.setOnQueryTextListener(onQueryTextListener);
searchView.setFocusable(true);
- customSearchView.addView(searchView);
+ 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
}
}
+ 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() {
currentSearchOperation = null;
}
setIndexAndSearchText((indexIndex + 1) % dictionary.indices.size(),
- searchView.getQuery().toString());
+ searchView.getQuery().toString(), false);
}
void onLanguageButtonLongClick(final Context context) {
}
};
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().postDelayed(new Runnable() {
@Override
public void run() {
- setIndexAndSearchText(actualIndexToUse, selectedText);
+ setIndexAndSearchText(actualIndexToUse, selectedText, true);
}
}, 100);
}
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);
}
- private void setIndexAndSearchText(int newIndex, String newSearchText) {
+ private void setIndexAndSearchText(int newIndex, String newSearchText, boolean hideKeyboard) {
Log.d(LOG, "Changing index to: " + newIndex);
if (newIndex == -1) {
Log.e(LOG, "Invalid index.");
setDictionaryPrefs(this, dictFile, index.shortName, searchView.getQuery().toString());
updateLangButton();
}
- setSearchText(newSearchText, true);
+ setSearchText(newSearchText, true, hideKeyboard);
}
- private void setSearchText(final String text, final boolean triggerSearch) {
+ private void setSearchText(final String text, final boolean triggerSearch, boolean hideKeyboard) {
Log.d(LOG, "setSearchText, text=" + text + ", triggerSearch=" + triggerSearch);
// Disable the listener, because sometimes it doesn't work.
searchView.setOnQueryTextListener(null);
moveCursorToRight();
searchView.setOnQueryTextListener(onQueryTextListener);
- // Hide search icon once text is entered
- searchView.setIconifiedByDefault(text.length() > 0);
- 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:
+ if (hideKeyboard) {
+ hideKeyboard();
+ }
+ }
+
+ private void setSearchText(final String text, final boolean triggerSearch) {
+ setSearchText(text, triggerSearch, true);
}
// private long cursorDelayMillis = 100;
result.setFocusable(true);
result.setLongClickable(true);
// result.setBackgroundResource(android.R.drawable.menuitem_background);
-
+
result.setBackgroundResource(theme.normalRowBg);
result.setOnClickListener(new TextView.OnClickListener() {
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:
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;
}
currentSearchOperation = new SearchOperation(text, index);
searchExecutor.execute(currentSearchOperation);
+ ((FloatingActionButton)findViewById(R.id.floatSearchButton)).setImageResource(text.length() > 0 ? R.drawable.ic_clear_black_24dp : R.drawable.ic_search_black_24dp);
}
// --------------------------------------------------------------------------
projects / Dictionary.git / blobdiff