import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.database.MatrixCursor;
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.support.v7.preference.PreferenceManager;
import android.speech.tts.TextToSpeech;
import android.speech.tts.TextToSpeech.OnInitListener;
+import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.view.MenuItemCompat;
+import android.support.v4.widget.CursorAdapter;
import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.SearchView;
import android.support.v7.widget.SearchView.OnQueryTextListener;
import android.support.v7.widget.Toolbar;
import android.widget.AdapterView;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AutoCompleteTextView;
import android.widget.BaseAdapter;
import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.TableLayout;
import android.widget.TableRow;
import android.widget.TextView;
-import android.widget.TextView.BufferType;
import android.widget.Toast;
import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
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.LanguageResources;
import com.hughes.android.dictionary.engine.PairEntry;
import com.hughes.android.dictionary.engine.PairEntry.Pair;
import com.hughes.android.dictionary.engine.RowBase;
import java.io.RandomAccessFile;
import java.nio.channels.FileChannel;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.Locale;
import java.util.Random;
import java.util.Set;
-import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-public class DictionaryActivity extends ActionBarActivity {
+public class DictionaryActivity extends AppCompatActivity {
- static final String LOG = "QuickDic";
+ private static final String LOG = "QuickDic";
- DictionaryApplication application;
+ private DictionaryApplication application;
- File dictFile = null;
- FileChannel dictRaf = null;
- String dictFileTitleName = null;
+ private File dictFile = null;
+ private FileChannel dictRaf = null;
+ private String dictFileTitleName = null;
- Dictionary dictionary = null;
+ private Dictionary dictionary = null;
- int indexIndex = 0;
+ private int indexIndex = 0;
- Index index = null;
+ private Index index = null;
- List<RowBase> rowsToShow = null; // if not null, just show these rows.
+ private List<RowBase> rowsToShow = null; // if not null, just show these rows.
- final Random rand = new Random();
+ private final Random rand = new Random();
- final Handler uiHandler = new Handler();
+ private final Handler uiHandler = new Handler();
private final ExecutorService searchExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
@Override
- public Thread newThread(Runnable r) {
+ public Thread newThread(@NonNull Runnable r) {
return new Thread(r, "searchExecutor");
}
});
private SearchOperation currentSearchOperation = null;
+ private final int MAX_SEARCH_HISTORY = 10;
+ private final ArrayList<String> searchHistory = new ArrayList<>(MAX_SEARCH_HISTORY);
+ private MatrixCursor searchHistoryCursor = new MatrixCursor(new String[] {"_id", "search"});
- TextToSpeech textToSpeech;
- volatile boolean ttsReady;
+ private TextToSpeech textToSpeech;
+ private volatile boolean ttsReady;
- Typeface typeface;
- DictionaryApplication.Theme theme = DictionaryApplication.Theme.LIGHT;
- int textColorFg = Color.BLACK;
- int fontSizeSp;
+ private Typeface typeface;
+ private DictionaryApplication.Theme theme = DictionaryApplication.Theme.LIGHT;
+ private int textColorFg = Color.BLACK;
+ private int fontSizeSp;
private ListView listView;
private ListView getListView() {
return getListView().getAdapter();
}
- SearchView searchView;
- ImageButton languageButton;
- SearchView.OnQueryTextListener onQueryTextListener;
+ private SearchView searchView;
+ private AutoCompleteTextView searchTextView;
+ private ImageButton languageButton;
+ private SearchView.OnQueryTextListener onQueryTextListener;
- MenuItem nextWordMenuItem, previousWordMenuItem, randomWordMenuItem;
+ private MenuItem nextWordMenuItem;
+ private MenuItem previousWordMenuItem;
// Never null.
private File wordList = null;
private boolean clickOpensContextMenu = false;
// Visible for testing.
- ListAdapter indexAdapter = null;
+ private ListAdapter indexAdapter = null;
/**
* For some languages, loading the transliterators used in this search takes
Log.d(LOG, "onSaveInstanceState: " + searchView.getQuery().toString());
outState.putString(C.INDEX_SHORT_NAME, index.shortName);
outState.putString(C.SEARCH_TOKEN, searchView.getQuery().toString());
+ outState.putStringArrayList(C.SEARCH_HISTORY, searchHistory);
}
private int getMatchLen(String search, Index.IndexEntry e) {
}
dictRaf = null;
}
- Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()),
- Toast.LENGTH_LONG).show();
+ if (!isFinishing())
+ Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()),
+ Toast.LENGTH_LONG).show();
startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()));
finish();
}
+ private void saveSearchHistory() {
+ final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+ final SharedPreferences.Editor ed = prefs.edit();
+ for (int i = 0; i < searchHistory.size(); i++) {
+ ed.putString("history" + i, searchHistory.get(i));
+ }
+ ed.remove("history" + searchHistory.size());
+ ed.apply();
+ }
+
+ private void addToSearchHistory() {
+ addToSearchHistory(searchView.getQuery().toString());
+ }
+
+ private void addToSearchHistory(String text) {
+ if (text == null || text.isEmpty()) return;
+ int exists = searchHistory.indexOf(text);
+ if (exists >= 0) searchHistory.remove(exists);
+ else if (searchHistory.size() >= MAX_SEARCH_HISTORY) searchHistory.remove(searchHistory.size() - 1);
+ searchHistory.add(0, text);
+ searchHistoryCursor = new MatrixCursor(new String[] {"_id", "search"});
+ for (int i = 0; i < searchHistory.size(); i++) {
+ final Object[] row = {i, searchHistory.get(i)};
+ searchHistoryCursor.addRow(row);
+ }
+ if (searchView.getSuggestionsAdapter().getCursor() != null) {
+ searchView.getSuggestionsAdapter().swapCursor(searchHistoryCursor);
+ searchView.getSuggestionsAdapter().notifyDataSetChanged();
+ }
+ }
+
@Override
public void onCreate(Bundle savedInstanceState) {
DictionaryApplication.INSTANCE.init(getApplicationContext());
final Intent intent = getIntent();
String intentAction = intent.getAction();
- /**
- * @author Dominik Köppl Querying the Intent
+ /*
+ @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 ("com.hughes.action.ACTION_SEARCH_DICT".equals(intentAction)) {
String query = intent.getStringExtra(SearchManager.QUERY);
String from = intent.getStringExtra("from");
if (from != null)
}
}
- /**
- * @author Dominik Köppl Querying the Intent Intent.ACTION_SEARCH is a
+ /*
+ @author Dominik Köppl Querying the Intent Intent.ACTION_SEARCH is a
* simple query Arguments follow from android standard (see
* documentation)
*/
return;
}
}
- /**
- * @author Dominik Köppl If no dictionary is chosen, use the default
+ /*
+ @author Dominik Köppl If no dictionary is chosen, use the default
* dictionary specified in the preferences If this step does
* fail (no default dictionary specified), show a toast and
* abort.
}
if (dictFilename == null) {
- Toast.makeText(this, getString(R.string.no_dict_file), Toast.LENGTH_LONG).show();
+ if (!isFinishing())
+ Toast.makeText(this, getString(R.string.no_dict_file), Toast.LENGTH_LONG).show();
startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()));
finish();
return;
}
- if (dictRaf == null && dictFilename != null)
+ if (dictRaf == null)
dictFile = new File(dictFilename);
ttsReady = false;
}).start();
String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.otf.jpg");
- if ("SYSTEM".equals(fontName)) {
- typeface = Typeface.DEFAULT;
- } else if ("SERIF".equals(fontName)) {
- typeface = Typeface.SERIF;
- } else if ("SANS_SERIF".equals(fontName)) {
- typeface = Typeface.SANS_SERIF;
- } else if ("MONOSPACE".equals(fontName)) {
- typeface = Typeface.MONOSPACE;
- } else {
- if ("FreeSerif.ttf.jpg".equals(fontName)) {
- fontName = "FreeSerif.otf.jpg";
- }
- try {
- typeface = Typeface.createFromAsset(getAssets(), fontName);
- } catch (Exception e) {
- Log.w(LOG, "Exception trying to use typeface, using default.", e);
- Toast.makeText(this, getString(R.string.fontFailure, e.getLocalizedMessage()),
- Toast.LENGTH_LONG).show();
- }
+ switch (fontName) {
+ case "SYSTEM":
+ typeface = Typeface.DEFAULT;
+ break;
+ case "SERIF":
+ typeface = Typeface.SERIF;
+ break;
+ case "SANS_SERIF":
+ typeface = Typeface.SANS_SERIF;
+ break;
+ case "MONOSPACE":
+ typeface = Typeface.MONOSPACE;
+ break;
+ default:
+ if ("FreeSerif.ttf.jpg".equals(fontName)) {
+ fontName = "FreeSerif.otf.jpg";
+ }
+ try {
+ typeface = Typeface.createFromAsset(getAssets(), fontName);
+ } catch (Exception e) {
+ Log.w(LOG, "Exception trying to use typeface, using default.", e);
+ if (!isFinishing())
+ Toast.makeText(this, getString(R.string.fontFailure, e.getLocalizedMessage()),
+ Toast.LENGTH_LONG).show();
+ }
+ break;
}
if (typeface == null) {
Log.w(LOG, "Unable to create typeface, using default.");
if (text == null) {
text = "";
}
+
+ searchView.setOnSuggestionListener(new SearchView.OnSuggestionListener() {
+ @Override
+ public boolean onSuggestionSelect(int position) {
+ return false;
+ }
+
+ @Override
+ public boolean onSuggestionClick(int position) {
+ String h = searchHistory.get(position);
+ addToSearchHistory(h);
+ setSearchText(h, true);
+ return true;
+ }
+ });
+ searchView.setSuggestionsAdapter(new CursorAdapter(this, text.isEmpty() ? searchHistoryCursor : null, 0) {
+ @Override
+ public View newView(Context context, Cursor c, ViewGroup p) {
+ TextView v = new TextView(context);
+ v.setTextColor(textColorFg);
+ v.setTypeface(typeface);
+ v.setTextSize(TypedValue.COMPLEX_UNIT_SP, 4 * fontSizeSp / 3);
+ return v;
+ }
+ @Override
+ public void bindView(View v, Context context, Cursor c) {
+ TextView t = (TextView)v;
+ t.setText(c.getString(1));
+ }
+ });
+
+ // Set up search history
+ ArrayList<String> savedHistory = null;
+ if (savedInstanceState != null) savedHistory = savedInstanceState.getStringArrayList(C.SEARCH_HISTORY);
+ if (savedHistory != null && !savedHistory.isEmpty()) {
+ } else {
+ savedHistory = new ArrayList<>();
+ for (int i = 0; i < MAX_SEARCH_HISTORY; i++) {
+ String h = prefs.getString("history" + i, null);
+ if (h == null) break;
+ savedHistory.add(h);
+ }
+ }
+ for (int i = savedHistory.size() - 1; i >= 0; i--) {
+ addToSearchHistory(savedHistory.get(i));
+ }
+ addToSearchHistory(text);
+
setSearchText(text, true);
Log.d(LOG, "Trying to restore searchText=" + text);
@Override
public boolean onQueryTextSubmit(String query) {
Log.d(LOG, "OnQueryTextListener: onQueryTextSubmit: " + searchView.getQuery());
+ addToSearchHistory();
hideKeyboard();
return true;
}
};
searchView.setOnQueryTextListener(onQueryTextListener);
searchView.setFocusable(true);
+ searchTextView = (AutoCompleteTextView)searchView.findViewById(android.support.v7.appcompat.R.id.search_src_text);
LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(0,
FrameLayout.LayoutParams.WRAP_CONTENT, 1);
customSearchView.addView(searchView, lp);
showKeyboard();
}
- @Override
- protected void onPause() {
- super.onPause();
- }
-
- @Override
/**
* Invoked when MyWebView returns, since the user might have clicked some
* hypertext in the MyWebView.
*/
+ @Override
protected void onActivityResult(int requestCode, int resultCode, Intent result) {
super.onActivityResult(requestCode, resultCode, result);
if (result != null && result.hasExtra(C.SEARCH_TOKEN)) {
prefs.commit();
}
+ @Override
+ protected void onPause() {
+ super.onPause();
+ addToSearchHistory();
+ saveSearchHistory();
+ }
+
@Override
protected void onDestroy() {
super.onDestroy();
Log.d(LOG, "Trying to show soft keyboard.");
final boolean searchTextHadFocus = searchView.hasFocus();
searchView.requestFocusFromTouch();
+ searchTextView.requestFocus();
final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
manager.showSoftInput(searchView, InputMethodManager.SHOW_IMPLICIT);
+ manager.showSoftInput(searchTextView, InputMethodManager.SHOW_IMPLICIT);
if (!searchTextHadFocus) {
defocusSearchText();
}
}
}, delay);
}
+ searchView.post(new Runnable() {
+ @Override
+ public void run() {
+ searchTextView.setThreshold(0);
+ searchTextView.showDropDown();
+ }
+ });
}
private void hideKeyboard() {
manager.hideSoftInputFromWindow(searchView.getWindowToken(), 0);
}
- void updateLangButton() {
+ private void updateLangButton() {
final int flagId = IsoUtils.INSTANCE.getFlagIdForIsoCode(index.shortName);
if (flagId != 0) {
languageButton.setImageResource(flagId);
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();
+ if (!isFinishing())
+ Toast.makeText(this, getString(R.string.TTSbroken), Toast.LENGTH_LONG).show();
}
}
searchView.requestFocus();
}
if (searchView.getQuery().toString().length() > 0) {
+ addToSearchHistory();
searchView.setQuery("", false);
}
showKeyboard();
searchView.getQuery().toString(), false);
}
- void onLanguageButtonLongClick(final Context context) {
+ private void onLanguageButtonLongClick(final Context context) {
final Dialog dialog = new Dialog(context);
dialog.setContentView(R.layout.select_dictionary_dialog);
dialog.setTitle(R.string.selectDictionary);
final List<DictionaryInfo> installedDicts = application.getDictionariesOnDevice(null);
- ListView listView = (ListView) dialog.findViewById(android.R.id.list);
+ 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; dictionaryInfo.indexInfos != null && i < dictionaryInfo.indexInfos.size(); ++i) {
+ for (int i = 0; i < dictionaryInfo.indexInfos.size(); ++i) {
final IndexInfo indexInfo = dictionaryInfo.indexInfos.get(i);
final View button = IsoUtils.INSTANCE.createButton(parent.getContext(),
- dictionaryInfo, indexInfo, application.languageButtonPixels);
+ indexInfo, application.languageButtonPixels);
final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(),
getLaunchIntent(getApplicationContext(),
application.getPath(dictionaryInfo.uncompressedFilename),
dialog.show();
}
- void onUpDownButton(final boolean up) {
+ private void onUpDownButton(final boolean up) {
if (isFiltered()) {
return;
}
defocusSearchText();
}
- void onRandomWordButton() {
+ private void onRandomWordButton() {
int destIndexEntry = rand.nextInt(index.sortedIndexEntries.size());
final Index.IndexEntry dest = index.sortedIndexEntries.get(destIndexEntry);
setSearchText(dest.token, false);
// Options Menu
// --------------------------------------------------------------------------
- final Random random = new Random();
-
@Override
public boolean onCreateOptionsMenu(final Menu menu) {
});
}
- randomWordMenuItem = menu.add(getString(R.string.randomWord));
+ final MenuItem randomWordMenuItem = menu.add(getString(R.string.randomWord));
randomWordMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
}
});
- application.onCreateGlobalOptionsMenu(this, menu);
-
{
final MenuItem dictionaryManager = menu.add(getString(R.string.dictionaryManager));
MenuItemCompat.setShowAsAction(dictionaryManager, MenuItem.SHOW_AS_ACTION_NEVER);
final Context context = getListView().getContext();
final Dialog dialog = new Dialog(context);
dialog.setContentView(R.layout.about_dictionary_dialog);
- final TextView textView = (TextView) dialog.findViewById(R.id.text);
+ final TextView textView = dialog.findViewById(R.id.text);
dialog.setTitle(dictFileTitleName);
});
}
+ DictionaryApplication.onCreateGlobalOptionsMenu(this, menu);
+
return true;
}
if (clickOpensContextMenu && (row instanceof HtmlEntry.Row ||
(row instanceof TokenRow && ((TokenRow)row).getIndexEntry().htmlEntries.size() > 0))) {
final List<HtmlEntry> html = row instanceof TokenRow ? ((TokenRow)row).getIndexEntry().htmlEntries : Collections.singletonList(((HtmlEntry.Row)row).getEntry());
- final String highlight = row instanceof HtmlEntry.Row ? ((HtmlEntry.Row)row).getTokenRow(true).getToken() : null;
+ final String highlight = row instanceof HtmlEntry.Row ? row.getTokenRow(true).getToken() : null;
final MenuItem open = menu.add("Open");
open.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
Log.w(LOG, "Skipping findExact on index " + index.shortName);
}
}
- if (numFound != 1 || indexToUse == -1) {
+ if (numFound != 1) {
indexToUse = defaultIndexToUse;
}
// Without this extra delay, the call to jumpToRow that this
@Override
public void run() {
setIndexAndSearchText(actualIndexToUse, selectedText, true);
+ addToSearchHistory(selectedText);
}
}, 100);
}
* Called when user clicks outside of search text, so that they can start
* typing again immediately.
*/
- void defocusSearchText() {
+ private void defocusSearchText() {
// Log.d(LOG, "defocusSearchText");
// Request focus so that if we start typing again, it clears the text
// input.
// searchView.selectAll();
}
- protected void onListItemClick(ListView l, View v, int rowIdx, long id) {
+ private void onListItemClick(ListView l, View v, int rowIdx, long id) {
defocusSearchText();
if (clickOpensContextMenu && dictRaf != null) {
openContextMenu(v);
}
@SuppressLint("SimpleDateFormat")
- void onAppendToWordList(final RowBase row) {
+ private void onAppendToWordList(final RowBase row) {
defocusSearchText();
final StringBuilder rawText = new StringBuilder();
try {
wordList.getParentFile().mkdirs();
final PrintWriter out = new PrintWriter(new FileWriter(wordList, true));
- out.println(rawText.toString());
+ out.println(rawText);
out.close();
} catch (Exception e) {
Log.e(LOG, "Unable to append to " + wordList.getAbsolutePath(), e);
- Toast.makeText(this,
- getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()),
- Toast.LENGTH_LONG).show();
+ if (!isFinishing())
+ Toast.makeText(this,
+ getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()),
+ Toast.LENGTH_LONG).show();
}
- return;
}
@SuppressWarnings("deprecation")
- void onCopy(final RowBase row) {
+ private void onCopy(final RowBase row) {
defocusSearchText();
Log.d(LOG, "Copy, row=" + row);
Log.d(LOG, "Trying to hide soft keyboard.");
final InputMethodManager inputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
View focus = getCurrentFocus();
- if (focus != null) {
+ if (inputManager != null && focus != null) {
inputManager.hideSoftInputFromWindow(focus.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS);
}
// Disable the listener, because sometimes it doesn't work.
searchView.setOnQueryTextListener(null);
searchView.setQuery(text, false);
- moveCursorToRight();
searchView.setOnQueryTextListener(onQueryTextListener);
if (triggerSearch) {
setSearchText(text, triggerSearch, true);
}
- // 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);
- // }
- }
-
// --------------------------------------------------------------------------
// SearchOperation
// --------------------------------------------------------------------------
Log.d(LOG, "searchFinished: " + searchOperation + ", searchResult=" + searchResult);
currentSearchOperation = null;
- uiHandler.postDelayed(new Runnable() {
+ // Note: it's important to post to the ListView, otherwise
+ // the jumpToRow will randomly not work.
+ getListView().post(new Runnable() {
@Override
public void run() {
if (currentSearchOperation == null) {
Log.d(LOG, "More coming, waiting for currentSearchOperation.");
}
}
- }, 20);
+ });
}
- private final void jumpToRow(final int row) {
+ private void jumpToRow(final int row) {
Log.d(LOG, "jumpToRow: " + row + ", refocusSearchText=" + false);
// getListView().requestFocusFromTouch();
getListView().setSelectionFromTop(row, 0);
getListView().setSelected(true);
}
- static final Pattern WHITESPACE = Pattern.compile("\\s+");
+ private static final Pattern WHITESPACE = Pattern.compile("\\s+");
final class SearchOperation implements Runnable {
}
public String toString() {
- return String.format("SearchOperation(%s,%s)", searchText, interrupted.toString());
+ return String.format("SearchOperation(%s,%s)", searchText, interrupted);
}
@Override
Log.d(LOG, "interrupted, skipping searchFinished.");
}
} catch (Exception e) {
- Log.e(LOG, "Failure during search (can happen during Activity close.");
+ Log.e(LOG, "Failure during search (can happen during Activity close): " + e.getMessage());
} finally {
synchronized (this) {
done = true;
private void showHtml(final List<HtmlEntry> htmlEntries, final String htmlTextToHighlight) {
String html = HtmlEntry.htmlBody(htmlEntries, index.shortName);
+ String style = "";
+ if (typeface == Typeface.SERIF) { style = "font-family: serif;"; }
+ else if (typeface == Typeface.SANS_SERIF) { style = "font-family: sans-serif;"; }
+ else if (typeface == Typeface.MONOSPACE) { style = "font-family: monospace;"; }
+ if (application.getSelectedTheme() == DictionaryApplication.Theme.DEFAULT)
+ style += "background-color: black; color: white;";
// Log.d(LOG, "html=" + html);
startActivityForResult(
HtmlDisplayActivity.getHtmlIntent(getApplicationContext(), String.format(
- "<html><head><meta name=\"viewport\" content=\"width=device-width\"></head><body>%s</body></html>", html),
+ "<html><head><meta name=\"viewport\" content=\"width=device-width\"></head><body style=\"%s\">%s</body></html>", style, html),
htmlTextToHighlight, false),
0);
}
- static ViewGroup.LayoutParams WEIGHT_1 = new LinearLayout.LayoutParams(
- ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT, 1.0f);
-
- static ViewGroup.LayoutParams WEIGHT_0 = new LinearLayout.LayoutParams(
- ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT, 0.0f);
-
final class IndexAdapter extends BaseAdapter {
private static final float PADDING_DEFAULT_DP = 8;
IndexAdapter(final Index index, final List<RowBase> rows, final List<String> toHighlight) {
this.index = index;
this.rows = rows;
- this.toHighlight = new LinkedHashSet<String>(toHighlight);
+ this.toHighlight = new LinkedHashSet<>(toHighlight);
getMetrics();
}
DisplayMetrics dm = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(dm);
scale = dm.density;
- } catch (NullPointerException e)
+ } catch (NullPointerException ignored)
{}
// Convert the dps to pixels, based on density scale
mPaddingDefault = (int) (PADDING_DEFAULT_DP * scale + 0.5f);
}
}
+ private void addBoldSpans(String token, String col1Text, Spannable col1Spannable) {
+ int startPos = 0;
+ while ((startPos = col1Text.indexOf(token, startPos)) != -1) {
+ col1Spannable.setSpan(new StyleSpan(Typeface.BOLD), startPos, startPos
+ + token.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+ startPos += token.length();
+ }
+ }
+
private TableLayout getView(final int position, PairEntry.Row row, ViewGroup parent,
TableLayout result) {
final Context context = parent.getContext();
final int rowCount = entry.pairs.size();
if (result == null) {
result = new TableLayout(context);
+ result.setStretchAllColumns(true);
// Because we have a Button inside a ListView row:
// http://groups.google.com/group/android-developers/browse_thread/thread/3d96af1530a7d62a?pli=1
result.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
result.removeViews(rowCount, result.getChildCount() - rowCount);
}
- final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams();
- layoutParams.weight = 0.5f;
- layoutParams.leftMargin = mPaddingLarge;
-
for (int r = result.getChildCount(); r < rowCount; ++r) {
+ final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT);
+ layoutParams.leftMargin = mPaddingLarge;
+
final TableRow tableRow = new TableRow(result.getContext());
final TextView col1 = new TextView(tableRow.getContext());
col1.setTextIsSelectable(true);
col2.setTextIsSelectable(true);
}
+ col1.setTextColor(textColorFg);
+ col2.setTextColor(textColorFg);
- // Set the columns in the table.
- if (r > 0) {
- final TextView bullet = new TextView(tableRow.getContext());
- bullet.setText(" •");
- tableRow.addView(bullet);
- }
- tableRow.addView(col1, layoutParams);
- if (r > 0) {
- final TextView bullet = new TextView(tableRow.getContext());
- bullet.setText(" •");
- tableRow.addView(bullet);
- }
- tableRow.addView(col2, layoutParams);
col1.setWidth(1);
col2.setWidth(1);
col2.setOnLongClickListener(textViewLongClickListenerIndex1);
}
+ // Set the columns in the table.
+ if (r == 0) {
+ tableRow.addView(col1, layoutParams);
+ tableRow.addView(col2, layoutParams);
+ } else {
+ for (int i = 0; i < 2; i++) {
+ final TextView bullet = new TextView(tableRow.getContext());
+ bullet.setText(" • ");
+ LinearLayout wrapped = new LinearLayout(context);
+ wrapped.setOrientation(LinearLayout.HORIZONTAL);
+ LinearLayout.LayoutParams p1 = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, 0);
+ wrapped.addView(bullet, p1);
+ LinearLayout.LayoutParams p2 = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, 1);
+ wrapped.addView(i == 0 ? col1 : col2, p2);
+ tableRow.addView(wrapped, layoutParams);
+ }
+ }
+
result.addView(tableRow);
}
for (int r = 0; r < rowCount; ++r) {
final TableRow tableRow = (TableRow)result.getChildAt(r);
- final TextView col1 = (TextView)tableRow.getChildAt(r == 0 ? 0 : 1);
- final TextView col2 = (TextView)tableRow.getChildAt(r == 0 ? 1 : 3);
+ View left = tableRow.getChildAt(0);
+ View right = tableRow.getChildAt(1);
+ if (r > 0) {
+ left = ((ViewGroup)left).getChildAt(1);
+ right = ((ViewGroup)right).getChildAt(1);
+ }
+ final TextView col1 = (TextView)left;
+ final TextView col2 = (TextView)right;
// Set what's in the columns.
final Pair pair = entry.pairs.get(r);
final Spannable col2Spannable = new SpannableString(col2Text);
// Bold the token instances in col1.
- final Set<String> toBold = toHighlight != null ? this.toHighlight : Collections
- .singleton(row.getTokenRow(true).getToken());
- for (final String token : toBold) {
- int startPos = 0;
- while ((startPos = col1Text.indexOf(token, startPos)) != -1) {
- col1Spannable.setSpan(new StyleSpan(Typeface.BOLD), startPos, startPos
- + token.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
- startPos += token.length();
+ if (toHighlight != null) {
+ for (final String token : toHighlight) {
+ addBoldSpans(token, col1Text, col1Spannable);
}
- }
+ } else
+ addBoldSpans(row.getTokenRow(true).getToken(), col1Text, col1Spannable);
createTokenLinkSpans(col1, col1Spannable, col1Text);
createTokenLinkSpans(col2, col2Spannable, col2Text);
textView.setOnLongClickListener(indexIndex > 0 ? textViewLongClickListenerIndex1 : textViewLongClickListenerIndex0);
textView.setLongClickable(true);
- // Doesn't work:
- // textView.setTextColor(android.R.color.secondary_text_light);
textView.setTypeface(typeface);
if (isTokenRow) {
textView.setTextAppearance(context, theme.tokenRowFg);
} else {
textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
}
+ textView.setTextColor(textColorFg);
if (!htmlEntries.isEmpty()) {
textView.setClickable(true);
textView.setMovementMethod(LinkMovementMethod.getInstance());
}
- static final Pattern CHAR_DASH = Pattern.compile("['\\p{L}\\p{M}\\p{N}]+");
+ private 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) {
}
}
- String selectedSpannableText = null;
+ private String selectedSpannableText = null;
- int selectedSpannableIndex = -1;
+ private int selectedSpannableIndex = -1;
@Override
public boolean onTouchEvent(MotionEvent event) {
}
}
- final TextViewLongClickListener textViewLongClickListenerIndex0 = new TextViewLongClickListener(
+ private final TextViewLongClickListener textViewLongClickListenerIndex0 = new TextViewLongClickListener(
0);
- final TextViewLongClickListener textViewLongClickListenerIndex1 = new TextViewLongClickListener(
+ private final TextViewLongClickListener textViewLongClickListenerIndex1 = new TextViewLongClickListener(
1);
// --------------------------------------------------------------------------
// SearchText
// --------------------------------------------------------------------------
- void onSearchTextChange(final String text) {
+ private void onSearchTextChange(final String text) {
if ("thadolina".equals(text)) {
final Dialog dialog = new Dialog(getListView().getContext());
dialog.setContentView(R.layout.thadolina_dialog);
dialog.setTitle("Ti amo, amore mio!");
- final ImageView imageView = (ImageView) dialog.findViewById(R.id.thadolina_image);
+ final ImageView imageView = dialog.findViewById(R.id.thadolina_image);
imageView.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
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);
+ searchView.getSuggestionsAdapter().swapCursor(text.isEmpty() ? searchHistoryCursor : null);
+ searchView.getSuggestionsAdapter().notifyDataSetChanged();
}
// --------------------------------------------------------------------------
// Filtered results.
// --------------------------------------------------------------------------
- boolean isFiltered() {
+ private boolean isFiltered() {
return rowsToShow != null;
}
- void setFiltered(final SearchOperation searchOperation) {
+ private void setFiltered(final SearchOperation searchOperation) {
if (nextWordMenuItem != null) {
nextWordMenuItem.setEnabled(false);
previousWordMenuItem.setEnabled(false);
setListAdapter(new IndexAdapter(index, rowsToShow, searchOperation.searchTokens));
}
- void clearFiltered() {
+ private void clearFiltered() {
if (nextWordMenuItem != null) {
nextWordMenuItem.setEnabled(true);
previousWordMenuItem.setEnabled(true);
projects / Dictionary.git / blobdiff