package com.hughes.android.dictionary;
-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.PairEntry;
-import com.hughes.android.dictionary.engine.PairEntry.Pair;
-import com.hughes.android.dictionary.engine.RowBase;
-import com.hughes.android.dictionary.engine.TokenRow;
-import com.hughes.android.dictionary.engine.TransliteratorManager;
-import com.hughes.android.util.IntentLauncher;
-import com.hughes.android.util.NonLinkClickableSpan;
-
+import android.annotation.SuppressLint;
import android.app.Dialog;
-import android.app.ListActivity;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.graphics.Color;
import android.graphics.Typeface;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
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;
import android.util.Log;
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.LayoutInflater;
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;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.BaseAdapter;
import android.widget.Button;
import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ListAdapter;
import android.widget.TableLayout;
import android.widget.TableRow;
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;
+import com.hughes.android.dictionary.engine.TokenRow;
+import com.hughes.android.dictionary.engine.TransliteratorManager;
+import com.hughes.android.util.IntentLauncher;
+import com.hughes.android.util.NonLinkClickableSpan;
+import com.hughes.util.StringUtil;
+
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
+import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Locale;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.Executor;
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";
- private String initialSearchText;
-
DictionaryApplication application;
File dictFile = null;
// 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) {
int fontSizeSp;
- EditText searchText;
+// EditText searchText;
+ SearchView searchView;
+ ImageView searchHintIcon;
- Button langButton;
+ MenuItem nextWordMenuItem, previousWordMenuItem;
// Never null.
private File wordList = null;
@Override
protected void onSaveInstanceState(final Bundle outState) {
- super.onSaveInstanceState(outState);
- Log.d(LOG, "onSaveInstanceState: " + searchText.getText().toString());
+ super.onSaveInstanceState(outState);
+ Log.d(LOG, "onSaveInstanceState: " + searchView.getQuery().toString());
outState.putInt(C.INDEX_INDEX, indexIndex);
- outState.putString(C.SEARCH_TOKEN, searchText.getText().toString());
+ outState.putString(C.SEARCH_TOKEN, searchView.getQuery().toString());
}
@Override
application = (DictionaryApplication) getApplication();
theme = application.getSelectedTheme();
+ textColorFg = getResources().getColor(theme.tokenRowFgColor);
final Intent intent = getIntent();
dictFile = new File(intent.getStringExtra(C.DICT_FILE));
+ ttsReady = false;
+ textToSpeech = new TextToSpeech(getApplicationContext(), new OnInitListener() {
+ @Override
+ public void onInit(int status) {
+ ttsReady = true;
+ updateTTSLanuage();
+ }
+ });
+
try {
final String name = application.getDictionaryName(dictFile.getName());
this.setTitle("QuickDic: " + name);
uiHandler.post(new Runnable() {
@Override
public void run() {
- onSearchTextChange(searchText.getText().toString());
+ onSearchTextChange(searchView.getQuery().toString());
}
});
}
}
setContentView(R.layout.dictionary_activity);
- searchText = (EditText) findViewById(R.id.SearchText);
- searchText.setTypeface(typeface);
- searchText.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
-
- langButton = (Button) findViewById(R.id.LangButton);
-
- searchText.requestFocus();
- searchText.addTextChangedListener(searchTextWatcher);
-
- // Set the search text from the intent, then the saved state.
- String text = getIntent().getStringExtra(C.SEARCH_TOKEN);
- if (savedInstanceState != null) {
- text = savedInstanceState.getString(C.SEARCH_TOKEN);
- }
- if (text == null) {
- text = "";
- }
- setSearchText(text, true);
- Log.d(LOG, "Trying to restore searchText=" + text);
-
- final Button clearSearchTextButton = (Button) findViewById(R.id.ClearSearchTextButton);
- clearSearchTextButton.setOnClickListener(new OnClickListener() {
- public void onClick(View v) {
- onClearSearchTextButton(clearSearchTextButton);
- }
- });
- clearSearchTextButton.setVisibility(PreferenceManager.getDefaultSharedPreferences(this)
- .getBoolean(getString(R.string.showClearSearchTextButtonKey), true) ? View.VISIBLE
- : View.GONE);
-
- final Button langButton = (Button) findViewById(R.id.LangButton);
- langButton.setOnClickListener(new OnClickListener() {
- public void onClick(View v) {
- onLanguageButton();
- }
- });
- langButton.setOnLongClickListener(new OnLongClickListener() {
- @Override
- public boolean onLongClick(View v) {
- onLanguageButtonLongClick(v.getContext());
- return true;
- }
- });
- updateLangButton();
-
- final Button upButton = (Button) findViewById(R.id.UpButton);
- upButton.setOnClickListener(new OnClickListener() {
- public void onClick(View v) {
- onUpDownButton(true);
- }
- });
- final Button downButton = (Button) findViewById(R.id.DownButton);
- downButton.setOnClickListener(new OnClickListener() {
- public void onClick(View v) {
- onUpDownButton(false);
- }
- });
-
- 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) {
- }
- });
-
+// 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);
+// }
+// });
+
+
+
+// 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);
+
+// getListView().setOnItemSelectedListener(new ListView.OnItemSelectedListener() {
+// @Override
+// public void onItemSelected(AdapterView<?> adapterView, View arg1, final int position,
+// long id) {
+// if (!searchText.hasFocus()) {
+// 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());
// }
Log.d(LOG, "wordList=" + wordList + ", saveOnlyFirstSubentry=" + saveOnlyFirstSubentry);
- setDictionaryPrefs(this, dictFile, indexIndex, searchText.getText().toString());
+ ActionBar actionBar = getSupportActionBar();
+ actionBar.setDisplayShowTitleEnabled(false);
+
+ //Inflate the custom view
+// View customNav = LayoutInflater.from(this).inflate(R.layout.dictionary_search_view, null);
+ searchView = new SearchView(getSupportActionBar().getThemedContext());
+ searchView.setIconifiedByDefault(false);
+// searchView.setIconified(false); // puts the magifying 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.setMaxWidth(200);
+ 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);
+ searchView.setOnQueryTextListener(new OnQueryTextListener() {
+ @Override
+ public boolean onQueryTextSubmit(String query) {
+ Log.d(LOG, "OnQueryTextListener: onQueryTextSubmit: " + searchView.getQuery());
+ return true;
+ }
+
+ @Override
+ public boolean onQueryTextChange(String newText) {
+// if (searchView.hasFocus()) {
+ Log.d(LOG, "OnQueryTextListener: onQueryTextChange: " + searchView.getQuery());
+ // If they were typing to cause the change, update the UI.
+ onSearchTextChange(searchView.getQuery().toString());
+// }
+ return true;
+ }
+ });
+
+ // Set the search text from the intent, then the saved state.
+ String text = getIntent().getStringExtra(C.SEARCH_TOKEN);
+ if (savedInstanceState != null) {
+ text = savedInstanceState.getString(C.SEARCH_TOKEN);
+ }
+ if (text == null) {
+ text = "";
+ }
+ setSearchText(text, true);
+ Log.d(LOG, "Trying to restore searchText=" + text);
+
+ setDictionaryPrefs(this, dictFile, indexIndex, searchView.getQuery().toString());
+
+ searchHintIcon = (ImageView) searchView.findViewById(R.id.abs__search_mag_icon);
+ searchHintIcon.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View arg0) {
+ onLanguageButton();
+ }
+ });
+ searchHintIcon.setOnLongClickListener(new OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View v) {
+ onLanguageButtonLongClick(v.getContext());
+ return true;
+ }
+ });
+
+
+
+// ImageView searchHintIcon = (ImageView) searchView.findViewById(searchView.getContext().getResources().
+// getIdentifier("android:id/search_mag_icon", null, null));
+// searchHintIcon.setImageResource(android.R.color.transparent);
+// searchView.setOnQueryTextListener(this);
+// menu.add("Search")
+//// .setIcon(isLight ? R.drawable.ic_search_inverse : R.drawable.abs__ic_search)
+// .setActionView(searchView)
+// .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+ actionBar.setCustomView(searchView);
+ actionBar.setDisplayShowCustomEnabled(true);
+
+ updateLangButton();
}
@Override
protected void onResume() {
+ Log.d(LOG, "onResume");
super.onResume();
- if (PreferenceActivity.prefsMightHaveChanged) {
- PreferenceActivity.prefsMightHaveChanged = false;
+ if (SettingsActivity.settingsMightHaveChanged) {
+ SettingsActivity.settingsMightHaveChanged = false;
finish();
startActivity(getIntent());
}
- if (initialSearchText != null) {
- setSearchText(initialSearchText, true);
- }
+ showKeyboard();
}
@Override
super.onPause();
}
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent result) {
+ super.onActivityResult(requestCode, resultCode, result);
+ if (result != null && result.hasExtra(C.SEARCH_TOKEN)) {
+ Log.d(LOG, "onActivityResult: " + result.getStringExtra(C.SEARCH_TOKEN));
+ jumpToTextFromHyperLink(result.getStringExtra(C.SEARCH_TOKEN), indexIndex);
+ }
+ }
+
private static void setDictionaryPrefs(final Context context, final File dictFile,
final int indexIndex, final String searchToken) {
final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(
// Buttons
// --------------------------------------------------------------------------
- private void onClearSearchTextButton(final Button clearSearchTextButton) {
+ private void onClearSearchTextButton() {
setSearchText("", true);
- Log.d(LOG, "Trying to show soft keyboard.");
- final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
- manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT);
+ 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);
}
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);
- // }
+ final LanguageResources languageResources =
+ Language.isoCodeToResources.get(index.shortName);
+ if (languageResources != null && languageResources.flagId != 0) {
+ searchHintIcon.setImageResource(languageResources.flagId);
+ } else {
+ if (index == dictionary.indices.get(0)) {
+ searchHintIcon.setImageResource(android.R.drawable.ic_media_next);
+ } else {
+ searchHintIcon.setImageResource(android.R.drawable.ic_media_previous);
+ }
+ }
+ updateTTSLanuage();
+ }
+
+ private void updateTTSLanuage() {
+ if (!ttsReady || index == null || textToSpeech == null) {
+ Log.d(LOG, "Can't updateTTSLanguage.");
+ return;
+ }
+ 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) {
+ Log.e(LOG, "TTS not available in this language: ttsResult=" + ttsResult);
+ }
}
void onLanguageButton() {
currentSearchOperation.interrupted.set(true);
currentSearchOperation = null;
}
- changeIndexGetFocusAndResearch((indexIndex + 1) % dictionary.indices.size());
+ changeIndexAndResearch((indexIndex + 1) % dictionary.indices.size());
}
void onLanguageButtonLongClick(final Context context) {
listView.setAdapter(new BaseAdapter() {
@Override
public View getView(int position, View convertView, ViewGroup parent) {
+ final DictionaryInfo dictionaryInfo = getItem(position);
+
final LinearLayout result = new LinearLayout(parent.getContext());
- final DictionaryInfo dictionaryInfo = getItem(position);
- final Button button = new Button(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 IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(),
+ getLaunchIntent(
+ application.getPath(dictionaryInfo.uncompressedFilename),
+ i, searchView.getQuery().toString())) {
+ @Override
+ protected void onGo() {
+ dialog.dismiss();
+ DictionaryActivity.this.finish();
+ };
+ };
+ button.setOnClickListener(intentLauncher);
+ result.addView(button);
+
+ }
+
+ final TextView nameView = new TextView(parent.getContext());
final String name = application
.getDictionaryName(dictionaryInfo.uncompressedFilename);
- button.setText(name);
- final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(),
- getLaunchIntent(application.getPath(dictionaryInfo.uncompressedFilename),
- 0, searchText.getText().toString())) {
- @Override
- protected void onGo() {
- dialog.dismiss();
- DictionaryActivity.this.finish();
- };
- };
- button.setOnClickListener(intentLauncher);
+ nameView.setText(name);
final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
layoutParams.width = 0;
layoutParams.weight = 1.0f;
- button.setLayoutParams(layoutParams);
- result.addView(button);
+ nameView.setLayoutParams(layoutParams);
+ result.addView(nameView);
+
return result;
}
dialog.show();
}
- private void changeIndexGetFocusAndResearch(final int newIndex) {
+ 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, searchView.getQuery().toString());
setListAdapter(indexAdapter);
updateLangButton();
- searchText.requestFocus(); // Otherwise, nothing may happen.
- onSearchTextChange(searchText.getText().toString());
- setDictionaryPrefs(this, dictFile, indexIndex, searchText.getText().toString());
+ setSearchText(searchView.getQuery().toString(), true);
}
void onUpDownButton(final boolean up) {
}
final Index.IndexEntry dest = index.sortedIndexEntries.get(destIndexEntry);
Log.d(LOG, "onUpDownButton, destIndexEntry=" + dest.token);
- searchText.removeTextChangedListener(searchTextWatcher);
- searchText.setText(dest.token);
- if (searchText.getLayout() != null) {
- // Surprising, but this can otherwise crash sometimes...
- Selection.moveToRightEdge(searchText.getText(), searchText.getLayout());
- }
+ setSearchText(dest.token, false);
jumpToRow(index.sortedIndexEntries.get(destIndexEntry).startRow);
- searchText.addTextChangedListener(searchTextWatcher);
+ defocusSearchText();
}
// --------------------------------------------------------------------------
// --------------------------------------------------------------------------
final Random random = new Random();
-
+
@Override
public boolean onCreateOptionsMenu(final Menu menu) {
+ //Create the search view
+// SearchView searchView = new SearchView(getSupportActionBar().getThemedContext());
+// searchView.setIconifiedByDefault(false);
+// searchView.setQueryHint(getString(R.string.searchText));
+// searchView.setSubmitButtonEnabled(false);
+// searchView.setMaxWidth(200);
+// searchView.setImeOptions(
+// EditorInfo.IME_ACTION_SEARCH |
+// EditorInfo.IME_FLAG_NO_EXTRACT_UI |
+// EditorInfo.IME_FLAG_NO_ENTER_ACTION |
+//// EditorInfo.IME_FLAG_NO_FULLSCREEN |
+// EditorInfo.IME_MASK_ACTION |
+// EditorInfo.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+//// searchView.setOnQueryTextListener(this);
+// menu.add("Search")
+//// .setIcon(isLight ? R.drawable.ic_search_inverse : R.drawable.abs__ic_search)
+// .setActionView(searchView)
+// .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+
+// final ImageView searchHintIcon =
+// (ImageView) searchView.findViewById(R.id.abs__search_mag_icon);
+// searchHintIcon.setImageResource(android.R.id.empty);
+// searchHintIcon.setAdjustViewBounds(true);
+// searchHintIcon.setMaxWidth(1);
+// searchHintIcon.setMaxHeight(1);
+// searchHintIcon.setVisibility(ImageView.GONE);
+// searchView.setOnQueryTextFocusChangeListener(new OnFocusChangeListener() {
+// @Override
+// public void onFocusChange(View arg0, boolean arg1) {
+// searchHintIcon.setVisibility(ImageView.GONE);
+// searchHintIcon.refreshDrawableState();
+// }
+// });
+
+
+ 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;
+ }
+ });
+ }
+
application.onCreateGlobalOptionsMenu(this, menu);
- {
- 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;
- }
- });
- }
+// {
+// 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;
+// }
+// });
+// }
{
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());
{
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();
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;
}
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) {
- int indexToUse = -1;
- for (int i = 0; i < dictionary.indices.size(); ++i) {
- final Index index = dictionary.indices.get(i);
- if (indexPrepFinished) {
- System.out.println("Doing index lookup: on " + selectedText);
- final IndexEntry indexEntry = index.findExact(selectedText);
- if (indexEntry != null) {
- final TokenRow tokenRow = index.rows.get(indexEntry.startRow)
- .getTokenRow(false);
- if (tokenRow != null && tokenRow.hasMainEntry) {
- indexToUse = i;
- break;
- }
- }
- } else {
- Log.w(LOG, "Skipping findExact on index " + index.shortName);
- }
- }
- if (indexToUse == -1) {
- indexToUse = selectedSpannableIndex;
- }
- final boolean changeIndex = indexIndex != indexToUse;
- setSearchText(selectedText, !changeIndex); // If we're not
- // changing
- // index, we have
- // to
- // triggerSearch.
- if (changeIndex) {
- changeIndexGetFocusAndResearch(indexToUse);
- }
- // Give focus back to list view because typing is done.
- getListView().requestFocus();
+ searchForSelection.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() {
+ public boolean onMenuItemClick(android.view.MenuItem item) {
+ jumpToTextFromHyperLink(selectedText, selectedSpannableIndex);
return false;
}
});
}
+ if (row instanceof TokenRow && ttsReady) {
+ final android.view.MenuItem speak = menu.add(R.string.speak);
+ speak.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(android.view.MenuItem item) {
+ textToSpeech.speak(((TokenRow) row).getToken(), TextToSpeech.QUEUE_FLUSH,
+ new HashMap<String, String>());
+ return false;
+ }
+ });
+ }
+ }
+
+ 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);
+ if (indexPrepFinished) {
+ System.out.println("Doing index lookup: on " + selectedText);
+ final IndexEntry indexEntry = index.findExact(selectedText);
+ if (indexEntry != null) {
+ final TokenRow tokenRow = index.rows.get(indexEntry.startRow)
+ .getTokenRow(false);
+ if (tokenRow != null && tokenRow.hasMainEntry) {
+ indexToUse = i;
+ break;
+ }
+ }
+ } else {
+ Log.w(LOG, "Skipping findExact on index " + index.shortName);
+ }
+ }
+ if (indexToUse == -1) {
+ indexToUse = defaultIndexToUse;
+ }
+ final boolean changeIndex = indexIndex != indexToUse;
+ if (changeIndex) {
+ setSearchText(selectedText, false);
+ changeIndexAndResearch(indexToUse);
+ } else {
+ setSearchText(selectedText, true);
+ }
}
@Override
}
}
+ @SuppressLint("SimpleDateFormat")
void onAppendToWordList(final RowBase row) {
defocusSearchText();
getListView().requestFocus();
// Visual indication that a new keystroke will clear the search text.
- searchText.selectAll();
+ // Doesn't seem to work unless earchText has focus.
+ // searchText.selectAll();
}
@SuppressWarnings("deprecation")
@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);
}
return true;
if (!triggerSearch) {
getListView().requestFocus();
}
- searchText.setText(text);
- searchText.requestFocus();
+ searchView.setQuery(text, false);
+ searchView.requestFocus();
moveCursorToRight();
if (triggerSearch) {
onSearchTextChange(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);
+// }
}
// --------------------------------------------------------------------------
}
}
}, 20);
-
}
private final void jumpToRow(final int row) {
- setSelection(row);
+ final boolean refocusSearchText = searchView.hasFocus();
+ Log.d(LOG, "jumpToRow: " + row + ", refocusSearchText=" + refocusSearchText);
+ getListView().requestFocusFromTouch();
+ getListView().setSelectionFromTop(row, 0);
getListView().setSelected(true);
+ if (refocusSearchText) {
+ searchView.requestFocus();
+ }
+ //Log.d(LOG, "getSelectedItemPosition():" + getSelectedItemPosition());
}
static final Pattern WHITESPACE = Pattern.compile("\\s+");
boolean done = false;
SearchOperation(final String searchText, final Index index) {
- this.searchText = searchText.trim();
+ this.searchText = StringUtil.normalizeWhitespace(searchText);
this.index = index;
}
searchResult = index.findInsertionPoint(searchText, interrupted);
} else {
searchTokens = Arrays.asList(searchTokenArray);
- multiWordSearchResult = index.multiWordSearch(searchTokens, interrupted);
+ multiWordSearchResult = index.multiWordSearch(searchText, searchTokens, interrupted);
}
Log.d(LOG,
"searchText=" + searchText + ", searchDuration="
searchFinished(SearchOperation.this);
}
});
+ } else {
+ Log.d(LOG, "interrupted, skipping searchFinished.");
}
} catch (Exception e) {
Log.e(LOG, "Failure during search (can happen during Activity close.");
final class IndexAdapter extends BaseAdapter {
+ private static final float PADDING_DEFAULT_DP = 8;
+
+ private static final float PADDING_LARGE_DP = 16;
+
final Index index;
final List<RowBase> rows;
final Set<String> toHighlight;
+ private int mPaddingDefault;
+
+ private int mPaddingLarge;
+
IndexAdapter(final Index index) {
this.index = index;
rows = index.rows;
this.toHighlight = null;
+ getMetrics();
}
IndexAdapter(final Index index, final List<RowBase> rows, final List<String> toHighlight) {
this.index = index;
this.rows = rows;
this.toHighlight = new LinkedHashSet<String>(toHighlight);
+ getMetrics();
+ }
+
+ private void getMetrics() {
+ // Get the screen's density scale
+ final float scale = getResources().getDisplayMetrics().density;
+ // Convert the dps to pixels, based on density scale
+ mPaddingDefault = (int) (PADDING_DEFAULT_DP * scale + 0.5f);
+ mPaddingLarge = (int) (PADDING_LARGE_DP * scale + 0.5f);
}
@Override
final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams();
layoutParams.weight = 0.5f;
+ layoutParams.leftMargin = mPaddingLarge;
for (int r = 0; r < rowCount; ++r) {
final TableRow tableRow = new TableRow(result.getContext());
return result;
}
- private TableLayout getView(HtmlEntry.Row row, ViewGroup parent, final TableLayout result) {
+ private TableLayout getPossibleLinkToHtmlEntryView(final boolean isTokenRow,
+ final String text, final boolean hasMainEntry, final List<HtmlEntry> htmlEntries,
+ final String htmlTextToHighlight, ViewGroup parent, final TableLayout result) {
final Context context = parent.getContext();
- final HtmlEntry htmlEntry = row.getEntry();
-
- // final TableRow tableRow = new TableRow(context);
- final LinearLayout tableRow = new LinearLayout(context);
+ final TableRow tableRow = new TableRow(result.getContext());
+ tableRow.setBackgroundResource(hasMainEntry ? theme.tokenRowMainBg
+ : theme.tokenRowOtherBg);
+ if (isTokenRow) {
+ tableRow.setPadding(mPaddingDefault, mPaddingDefault, mPaddingDefault, 0);
+ } else {
+ tableRow.setPadding(mPaddingLarge, mPaddingDefault, mPaddingDefault, 0);
+ }
result.addView(tableRow);
- // Text.
+ // Make it so we can long-click on these token rows, too:
final TextView textView = new TextView(context);
- textView.setText(htmlEntry.title);
- textView.setLayoutParams(new LinearLayout.LayoutParams(0,
- ViewGroup.LayoutParams.WRAP_CONTENT, 1.0f));
- tableRow.addView(textView);
-
- // Button.
- final Button button = new Button(context);
- button.setText("open");
- button.setLayoutParams(new LinearLayout.LayoutParams(
- ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0.0f));
- tableRow.addView(button);
+ textView.setText(text, BufferType.SPANNABLE);
+ createTokenLinkSpans(textView, (Spannable) textView.getText(), text);
+ final TextViewLongClickListener textViewLongClickListenerIndex0 = new TextViewLongClickListener(
+ 0);
+ textView.setOnLongClickListener(textViewLongClickListenerIndex0);
+ result.setLongClickable(true);
+
+ // Doesn't work:
+ // textView.setTextColor(android.R.color.secondary_text_light);
+ textView.setTypeface(typeface);
+ TableRow.LayoutParams lp = new TableRow.LayoutParams(0);
+ if (isTokenRow) {
+ textView.setTextAppearance(context, theme.tokenRowFg);
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 4 * fontSizeSp / 3);
+ } else {
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
+ }
+ lp.weight = 1.0f;
- button.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- startActivity(HtmlDisplayActivity.getHtmlIntent(String.format(
- "<html><head></head><body>%s</body></html>", htmlEntry.html)));
- }
- });
+ textView.setLayoutParams(lp);
+ tableRow.addView(textView);
+ if (!htmlEntries.isEmpty()) {
+ final ClickableSpan clickableSpan = new ClickableSpan() {
+ @Override
+ public void onClick(View widget) {
+ }
+ };
+ ((Spannable) textView.getText()).setSpan(clickableSpan, 0, text.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+ result.setClickable(true);
+ textView.setClickable(true);
+ textView.setMovementMethod(LinkMovementMethod.getInstance());
+ textView.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String html = HtmlEntry.htmlBody(htmlEntries, index.shortName);
+ //Log.d(LOG, "html=" + html);
+ startActivityForResult(
+ HtmlDisplayActivity.getHtmlIntent(String.format(
+ "<html><head></head><body>%s</body></html>", html),
+ htmlTextToHighlight, false),
+ 0);
+ }
+ });
+ }
return result;
}
private TableLayout getView(TokenRow row, ViewGroup parent, final TableLayout result) {
- final Context context = parent.getContext();
- final TextView textView = new TextView(context);
- textView.setText(row.getToken());
- // Doesn't work:
- // textView.setTextColor(android.R.color.secondary_text_light);
- textView.setTextAppearance(context, theme.tokenRowFg);
- textView.setTypeface(typeface);
- textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 5 * fontSizeSp / 4);
+ final IndexEntry indexEntry = row.getIndexEntry();
+ return getPossibleLinkToHtmlEntryView(true, indexEntry.token, row.hasMainEntry,
+ indexEntry.htmlEntries, null, parent, result);
+ }
- final TableRow tableRow = new TableRow(result.getContext());
- tableRow.addView(textView);
- tableRow.setBackgroundResource(row.hasMainEntry ? theme.tokenRowMainBg
- : theme.tokenRowOtherBg);
- result.addView(tableRow);
- return result;
+ private TableLayout getView(HtmlEntry.Row row, ViewGroup parent, final TableLayout result) {
+ final HtmlEntry htmlEntry = row.getEntry();
+ final TokenRow tokenRow = row.getTokenRow(true);
+ return getPossibleLinkToHtmlEntryView(false,
+ getString(R.string.seeAlso, htmlEntry.title, htmlEntry.entrySource.getName()),
+ false, Collections.singletonList(htmlEntry), tokenRow.getToken(), parent,
+ result);
}
}
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(), 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 (!searchText.isFocused()) {
+ if (!searchView.hasFocus()) {
Log.d(LOG, "searchText changed without focus, doing nothing.");
return;
}
private class SearchTextWatcher implements TextWatcher {
public void afterTextChanged(final Editable searchTextEditable) {
- if (searchText.hasFocus()) {
- Log.d(LOG, "Search text changed with focus: " + searchText.getText());
+ if (searchView.hasFocus()) {
+ Log.d(LOG, "SearchTextWatcher: Search text changed with focus: " + searchView.getQuery());
// If they were typing to cause the change, update the UI.
- onSearchTextChange(searchText.getText().toString());
+ onSearchTextChange(searchView.getQuery().toString());
}
}
}
void setFiltered(final SearchOperation searchOperation) {
- ((Button) findViewById(R.id.UpButton)).setEnabled(false);
- ((Button) 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() {
- ((Button) findViewById(R.id.UpButton)).setEnabled(true);
- ((Button) findViewById(R.id.DownButton)).setEnabled(true);
+ if (nextWordMenuItem != null) {
+ nextWordMenuItem.setEnabled(true);
+ previousWordMenuItem.setEnabled(true);
+ }
setListAdapter(new IndexAdapter(index));
rowsToShow = null;
}
projects / Dictionary.git / blobdiff