import android.content.SharedPreferences;
import android.graphics.Color;
import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.util.TypedValue;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Gravity;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.View.OnLongClickListener;
import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
import android.view.WindowManager;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.ImageView;
+import android.widget.ImageView.ScaleType;
import android.widget.LinearLayout;
import android.widget.ListAdapter;
import android.widget.ListView;
List<RowBase> rowsToShow = null; // if not null, just show these rows.
final Handler uiHandler = new Handler();
-
+
private final Executor searchExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
@Override
public Thread newThread(Runnable r) {
private SearchOperation currentSearchOperation = null;
-
TextToSpeech textToSpeech;
volatile boolean ttsReady;
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);
+ super.onSaveInstanceState(outState);
Log.d(LOG, "onSaveInstanceState: " + searchView.getQuery().toString());
- outState.putInt(C.INDEX_INDEX, indexIndex);
+ 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
super.onCreate(savedInstanceState);
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-
+
// Don't auto-launch if this fails.
- prefs.edit().remove(C.INDEX_INDEX).commit();
+ prefs.edit().remove(C.DICT_FILE).commit();
setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);
theme = application.getSelectedTheme();
textColorFg = getResources().getColor(theme.tokenRowFgColor);
-
-
final Intent intent = getIntent();
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
+ * @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"))
+ 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<DictionaryInfo> dicts = application.getUsableDicts();
- 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_INDEX, which_index);
-
- }
- intent.putExtra(C.DICT_FILE, application.getPath(info.uncompressedFilename).toString());
- break;
- }
- }
-
- }
+ 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<DictionaryInfo> 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)
+ * @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))
+ if (intentAction != null && intentAction.equals(Intent.ACTION_SEARCH))
{
String query = intent.getStringExtra(SearchManager.QUERY);
- if(query != null) getIntent().putExtra(C.SEARCH_TOKEN,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.
+ * @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)
+ 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 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)
+
+ 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);
+ if (dictFilename != null)
+ dictFile = new File(dictFilename);
ttsReady = false;
textToSpeech = new TextToSpeech(getApplicationContext(), new OnInitListener() {
updateTTSLanguage();
}
});
-
+
try {
final String name = application.getDictionaryName(dictFile.getName());
this.setTitle("QuickDic: " + name);
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));
// Cache some prefs.
wordList = new File(prefs.getString(getString(R.string.wordListFileKey),
- getString(R.string.wordListFileDefault)));
+ new File(application.getDictDir(), "wordList.txt").getAbsolutePath()));
saveOnlyFirstSubentry = prefs.getBoolean(getString(R.string.saveOnlyFirstSubentryKey),
false);
clickOpensContextMenu = prefs.getBoolean(getString(R.string.clickOpensContextMenuKey),
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) {
setSearchText(text, true);
Log.d(LOG, "Trying to restore searchText=" + text);
- setDictionaryPrefs(this, dictFile, indexIndex, searchView.getQuery().toString());
+ setDictionaryPrefs(this, dictFile, index.shortName, searchView.getQuery().toString());
updateLangButton();
+ searchView.requestFocus();
}
private void onCreateSetupActionBarAndSearchView() {
ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayShowTitleEnabled(false);
-
+ actionBar.setDisplayShowHomeEnabled(false);
+ actionBar.setDisplayHomeAsUpEnabled(false);
+
searchView = new SearchView(getSupportActionBar().getThemedContext());
searchView.setIconifiedByDefault(false);
- // searchView.setIconified(false); // puts the magifying glass in the
+ // searchView.setIconified(false); // puts the magnifying glass in the
// wrong place.
searchView.setQueryHint(getString(R.string.searchText));
searchView.setSubmitButtonEnabled(false);
}
};
searchView.setOnQueryTextListener(onQueryTextListener);
+ searchView.setFocusable(true);
searchHintIcon = (ImageView) searchView.findViewById(R.id.abs__search_mag_icon);
+ // http://stackoverflow.com/questions/2521959/how-to-scale-an-image-in-imageview-to-keep-the-aspect-ratio
+ searchHintIcon.setLayoutParams(new LinearLayout.LayoutParams(
+ application.languageButtonPixels * 3 / 4, LayoutParams.WRAP_CONTENT));
+ searchHintIcon.setScaleType(ScaleType.FIT_CENTER);
+ searchHintIcon.setAdjustViewBounds(true);
+ searchHintIcon.setPadding(1, application.languageButtonPixels / 8, 1, 0);
searchHintIcon.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
}
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();
}
// --------------------------------------------------------------------------
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);
+ // 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);
+ }
}
void updateLangButton() {
}
}
updateTTSLanguage();
- }
+ }
private void updateTTSLanguage() {
if (!ttsReady || index == null || textToSpeech == null) {
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 onLanguageButtonClick() {
+ if (dictionary.indices.size() == 1) {
+ // No need to work to switch indices.
+ return;
+ }
if (currentSearchOperation != null) {
currentSearchOperation.interrupted.set(true);
currentSearchOperation = null;
}
- setIndexAndSearchText((indexIndex + 1) % dictionary.indices.size(), searchView.getQuery().toString());
+ setIndexAndSearchText((indexIndex + 1) % dictionary.indices.size(),
+ searchView.getQuery().toString());
}
void onLanguageButtonLongClick(final Context context) {
dialog.setContentView(R.layout.select_dictionary_dialog);
dialog.setTitle(R.string.selectDictionary);
- final List<DictionaryInfo> installedDicts = ((DictionaryApplication) getApplication())
- .getUsableDicts();
+ final List<DictionaryInfo> installedDicts = application.getDictionariesOnDevice(null);
ListView listView = (ListView) dialog.findViewById(android.R.id.list);
-
final Button button = new Button(listView.getContext());
final String name = getString(R.string.dictionaryManager);
button.setText(name);
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, searchView.getQuery().toString())) {
+ indexInfo.shortName, searchView.getQuery().toString())) {
@Override
protected void onGo() {
dialog.dismiss();
};
button.setOnClickListener(intentLauncher);
result.addView(button);
-
}
final TextView nameView = new TextView(parent.getContext());
layoutParams.width = 0;
layoutParams.weight = 1.0f;
nameView.setLayoutParams(layoutParams);
+ nameView.setGravity(Gravity.CENTER_VERTICAL);
result.addView(nameView);
-
return result;
}
return installedDicts.size();
}
});
-
dialog.show();
}
// --------------------------------------------------------------------------
final Random random = new Random();
-
+
@Override
public boolean onCreateOptionsMenu(final Menu 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);
+ .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;
- }
- });
-
+ @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);
+ .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;
- }
- });
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ onUpDownButton(true);
+ return true;
+ }
+ });
}
application.onCreateGlobalOptionsMenu(this, menu);
{
- final MenuItem dictionaryList = menu.add(getString(R.string.dictionaryManager));
- dictionaryList.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- dictionaryList.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+ final MenuItem dictionaryManager = menu.add(getString(R.string.dictionaryManager));
+ dictionaryManager.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+ dictionaryManager.setOnMenuItemClickListener(new OnMenuItemClickListener() {
public boolean onMenuItemClick(final MenuItem menuItem) {
startActivity(DictionaryManagerActivity.getLaunchIntent());
finish();
final android.view.MenuItem addToWordlist = menu.add(getString(R.string.addToWordList,
wordList.getName()));
- addToWordlist.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() {
- public boolean onMenuItemClick(android.view.MenuItem item) {
- onAppendToWordList(row);
- return false;
- }
- });
+ 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));
+ 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;
}
if (selectedSpannableText != null) {
final String selectedText = selectedSpannableText;
- final android.view.MenuItem searchForSelection = menu.add(getString(R.string.searchForSelection,
+ final android.view.MenuItem searchForSelection = menu.add(getString(
+ R.string.searchForSelection,
selectedSpannableText));
- searchForSelection.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() {
- public boolean onMenuItemClick(android.view.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;
+ }
+ });
}
if (row instanceof TokenRow && ttsReady) {
if (indexToUse == -1) {
indexToUse = defaultIndexToUse;
}
- setIndexAndSearchText(indexToUse, selectedText);
+ // 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.
// Visual indication that a new keystroke will clear the search text.
// Doesn't seem to work unless earchText has focus.
-// searchView.selectAll();
+ // searchView.selectAll();
}
@Override
if (event.getUnicodeChar() != 0) {
if (!searchView.hasFocus()) {
setSearchText("" + (char) event.getUnicodeChar(), true);
+ searchView.requestFocus();
}
- searchView.requestFocus();
return true;
}
if (keyCode == KeyEvent.KEYCODE_BACK) {
}
return super.onKeyDown(keyCode, event);
}
-
+
private void setIndexAndSearchText(int newIndex, String newSearchText) {
Log.d(LOG, "Changing index to: " + newIndex);
if (newIndex == -1) {
indexAdapter = new IndexAdapter(index);
setListAdapter(indexAdapter);
Log.d(LOG, "changingIndex, newLang=" + index.longName);
- setDictionaryPrefs(this, dictFile, indexIndex, searchView.getQuery().toString());
+ setDictionaryPrefs(this, dictFile, index.shortName, searchView.getQuery().toString());
updateLangButton();
}
setSearchText(newSearchText, true);
}
private void setSearchText(final String text, final boolean triggerSearch) {
- if (!triggerSearch) {
- searchView.setOnQueryTextListener(null);
- }
+ 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();
- if (!triggerSearch) {
- searchView.setOnQueryTextListener(onQueryTextListener);
- } else {
+ searchView.setOnQueryTextListener(onQueryTextListener);
+ if (triggerSearch) {
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(searchView.getQuery(), 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);
+ // }
}
// --------------------------------------------------------------------------
private final void jumpToRow(final int row) {
Log.d(LOG, "jumpToRow: " + row + ", refocusSearchText=" + false);
-// getListView().requestFocusFromTouch();
+ // getListView().requestFocusFromTouch();
getListView().setSelectionFromTop(row, 0);
getListView().setSelected(true);
}
searchResult = index.findInsertionPoint(searchText, interrupted);
} else {
searchTokens = Arrays.asList(searchTokenArray);
- multiWordSearchResult = index.multiWordSearch(searchText, searchTokens, interrupted);
+ multiWordSearchResult = index.multiWordSearch(searchText, searchTokens,
+ interrupted);
}
Log.d(LOG,
"searchText=" + searchText + ", searchDuration="
0);
textView.setOnLongClickListener(textViewLongClickListenerIndex0);
result.setLongClickable(true);
-
+
// Doesn't work:
// textView.setTextColor(android.R.color.secondary_text_light);
textView.setTypeface(typeface);
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());
@Override
public void onClick(View v) {
String html = HtmlEntry.htmlBody(htmlEntries, index.shortName);
- //Log.d(LOG, "html=" + html);
+ // Log.d(LOG, "html=" + html);
startActivityForResult(
HtmlDisplayActivity.getHtmlIntent(String.format(
"<html><head></head><body>%s</body></html>", html),
}
static final Pattern CHAR_DASH = Pattern.compile("['\\p{L}\\p{M}\\p{N}]+");
-
+
private void createTokenLinkSpans(final TextView textView, final Spannable spannable,
final String text) {
// Saw from the source code that LinkMovementMethod sets the selection!
textView.setMovementMethod(LinkMovementMethod.getInstance());
final Matcher matcher = CHAR_DASH.matcher(text);
while (matcher.find()) {
- spannable.setSpan(new NonLinkClickableSpan(textColorFg), matcher.start(), matcher.end(),
+ spannable.setSpan(new NonLinkClickableSpan(textColorFg), matcher.start(),
+ matcher.end(),
Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
}
}
Log.d(LOG, "searchText changed during shutdown, doing nothing.");
return;
}
-// if (!searchView.hasFocus()) {
-// 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.");