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;
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 {
+ Log.d(LOG, "Checking dictionary " + dics.get(i).uncompressedFilename);
+ final File dictfile = application.getPath(dics.get(i).uncompressedFilename);
+ Dictionary dic = new Dictionary(new RandomAccessFile(dictfile, "r"));
+ for (int j = 0; j < dic.indices.size(); ++j) {
+ Index idx = dic.indices.get(j);
+ Log.d(LOG, "Checking index " + idx.shortName);
+ if (idx.findExact(search) != null)
+ {
+ Log.d(LOG, "Found exact match");
+ dictFilename = dictfile.toString();
+ intent.putExtra(C.INDEX_SHORT_NAME, idx.shortName);
+ break;
+ }
+ int matchLen = getMatchLen(search, idx.findInsertionPoint(search, dummy));
+ Log.d(LOG, "Found partial match length " + matchLen);
+ if (matchLen > bestMatchLen)
+ {
+ bestFname = dictfile.toString();
+ bestIndex = idx.shortName;
+ bestMatchLen = matchLen;
+ }
+ }
+ } catch (Exception e) {}
+ }
+ if (dictFilename == null && bestFname != null)
+ {
+ dictFilename = bestFname;
+ intent.putExtra(C.INDEX_SHORT_NAME, bestIndex);
+ }
+ }
if (dictFilename == null)
{
}
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.
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 LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
customSearchView.setLayoutParams(layoutParams);
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;
}
});
languageButton.setAdjustViewBounds(true);
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);
searchView.setInputType(InputType.TYPE_CLASS_TEXT);
moveCursorToRight();
searchView.setOnQueryTextListener(onQueryTextListener);
- // Hide search icon once text is entered
- searchView.setIconifiedByDefault(text.length() > 0);
- searchView.setIconified(false);
-
if (triggerSearch) {
onSearchTextChange(text);
}
result.setFocusable(true);
result.setLongClickable(true);
// result.setBackgroundResource(android.R.drawable.menuitem_background);
-
+
result.setBackgroundResource(theme.normalRowBg);
result.setOnClickListener(new TextView.OnClickListener() {
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