import java.util.Date;\r
import java.util.LinkedHashSet;\r
import java.util.List;\r
+import java.util.Random;\r
import java.util.Set;\r
import java.util.concurrent.Executor;\r
import java.util.concurrent.Executors;\r
import android.content.Intent;\r
import android.content.SharedPreferences;\r
import android.graphics.Typeface;\r
+import android.net.Uri;\r
import android.os.Bundle;\r
import android.os.Handler;\r
import android.preference.PreferenceManager;\r
import android.view.KeyEvent;\r
import android.view.Menu;\r
import android.view.MenuItem;\r
-import android.view.WindowManager;\r
import android.view.MenuItem.OnMenuItemClickListener;\r
import android.view.MotionEvent;\r
import android.view.View;\r
import android.view.View.OnClickListener;\r
import android.view.View.OnLongClickListener;\r
import android.view.ViewGroup;\r
+import android.view.WindowManager;\r
import android.view.inputmethod.InputMethodManager;\r
import android.widget.AdapterView;\r
import android.widget.AdapterView.AdapterContextMenuInfo;\r
import android.widget.BaseAdapter;\r
import android.widget.Button;\r
import android.widget.EditText;\r
+import android.widget.ImageView;\r
import android.widget.LinearLayout;\r
import android.widget.ListAdapter;\r
import android.widget.ListView;\r
\r
import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;\r
import com.hughes.android.dictionary.engine.Dictionary;\r
+import com.hughes.android.dictionary.engine.EntrySource;\r
import com.hughes.android.dictionary.engine.Index;\r
+import com.hughes.android.dictionary.engine.Index.IndexEntry;\r
import com.hughes.android.dictionary.engine.PairEntry;\r
import com.hughes.android.dictionary.engine.PairEntry.Pair;\r
import com.hughes.android.dictionary.engine.RowBase;\r
public class DictionaryActivity extends ListActivity {\r
\r
static final String LOG = "QuickDic";\r
- \r
+\r
+ private String initialSearchText;\r
+\r
DictionaryApplication application;\r
File dictFile = null;\r
RandomAccessFile dictRaf = null;\r
private SearchOperation currentSearchOperation = null;\r
\r
C.Theme theme = C.Theme.LIGHT;\r
+ Typeface typeface;\r
int fontSizeSp;\r
EditText searchText;\r
Button langButton;\r
ListAdapter indexAdapter = null;\r
\r
final SearchTextWatcher searchTextWatcher = new SearchTextWatcher();\r
+ \r
+ /**\r
+ * For some languages, loading the transliterators used in this search takes\r
+ * a long time, so we fire it up on a different thread, and don't invoke it\r
+ * from the main thread until it's already finished once.\r
+ */\r
+ private volatile boolean indexPrepFinished = false;\r
+\r
+\r
\r
public DictionaryActivity() {\r
}\r
@Override\r
protected void onSaveInstanceState(final Bundle outState) {\r
super.onSaveInstanceState(outState);\r
+ Log.d(LOG, "onSaveInstanceState: " + searchText.getText().toString());\r
+ outState.putInt(C.INDEX_INDEX, indexIndex);\r
outState.putString(C.SEARCH_TOKEN, searchText.getText().toString());\r
}\r
\r
@Override\r
protected void onRestoreInstanceState(final Bundle outState) {\r
super.onRestoreInstanceState(outState);\r
- setSearchText(outState.getString(C.SEARCH_TOKEN));\r
+ Log.d(LOG, "onRestoreInstanceState: " + outState.getString(C.SEARCH_TOKEN));\r
+ onCreate(outState);\r
}\r
\r
@Override\r
- public void onCreate(Bundle savedInstanceState) { \r
+ public void onCreate(Bundle savedInstanceState) {\r
+ final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);\r
+ prefs.edit().remove(C.INDEX_INDEX).commit(); // Don't auto-launch if this fails.\r
+\r
+ setTheme(((DictionaryApplication)getApplication()).getSelectedTheme().themeId);\r
+\r
Log.d(LOG, "onCreate:" + this);\r
super.onCreate(savedInstanceState);\r
\r
application = (DictionaryApplication) getApplication();\r
theme = application.getSelectedTheme();\r
-\r
- // Clear them so that if something goes wrong, we won't relaunch.\r
- clearDictionaryPrefs(this);\r
\r
final Intent intent = getIntent();\r
dictFile = new File(intent.getStringExtra(C.DICT_FILE));\r
}\r
dictRaf = null;\r
}\r
- Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()), Toast.LENGTH_LONG);\r
+ Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()), Toast.LENGTH_LONG).show();\r
startActivity(DictionaryManagerActivity.getLaunchIntent());\r
finish();\r
return;\r
}\r
-\r
- indexIndex = intent.getIntExtra(C.INDEX_INDEX, 0) % dictionary.indices.size();\r
+ indexIndex = intent.getIntExtra(C.INDEX_INDEX, 0);\r
+ if (savedInstanceState != null) {\r
+ indexIndex = savedInstanceState.getInt(C.INDEX_INDEX, indexIndex);\r
+ }\r
+ indexIndex %= dictionary.indices.size();\r
Log.d(LOG, "Loading index " + indexIndex);\r
index = dictionary.indices.get(indexIndex);\r
setListAdapter(new IndexAdapter(index));\r
\r
// Pre-load the collators.\r
- searchExecutor.execute(new Runnable() {\r
+ new Thread(new Runnable() {\r
public void run() {\r
final long startMillis = System.currentTimeMillis();\r
- \r
- TransliteratorManager.init(new TransliteratorManager.Callback() {\r
- @Override\r
- public void onTransliteratorReady() {\r
- uiHandler.post(new Runnable() {\r
- @Override\r
- public void run() {\r
- onSearchTextChange(searchText.getText().toString());\r
- }\r
- });\r
- }\r
- });\r
- \r
- for (final Index index : dictionary.indices) {\r
- Log.d(LOG, "Starting collator load for lang=" + index.sortLanguage.getIsoCode());\r
+ try {\r
+ TransliteratorManager.init(new TransliteratorManager.Callback() {\r
+ @Override\r
+ public void onTransliteratorReady() {\r
+ uiHandler.post(new Runnable() {\r
+ @Override\r
+ public void run() {\r
+ onSearchTextChange(searchText.getText().toString());\r
+ }\r
+ });\r
+ }\r
+ });\r
\r
- final com.ibm.icu.text.Collator c = index.sortLanguage.getCollator(); \r
- if (c.compare("pre-print", "preppy") >= 0) {\r
- Log.e(LOG, c.getClass()\r
- + " is buggy, lookups may not work properly.");\r
+ for (final Index index : dictionary.indices) {\r
+ final String searchToken = index.sortedIndexEntries.get(0).token;\r
+ final IndexEntry entry = index.findExact(searchToken);\r
+ if (!searchToken.equals(entry.token)) {\r
+ Log.e(LOG, "Couldn't find token: " + searchToken + ", " + entry.token);\r
+ }\r
}\r
+ indexPrepFinished = true;\r
+ } catch (Exception e) {\r
+ Log.w(LOG, "Exception while prepping. This can happen if dictionary is closed while search is happening.");\r
}\r
- Log.d(LOG, "Loading collators took:"\r
- + (System.currentTimeMillis() - startMillis));\r
+ Log.d(LOG, "Prepping indices took:"\r
+ + (System.currentTimeMillis() - startMillis));\r
}\r
- });\r
- \r
- final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);\r
+ }).start();\r
\r
+ final String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.ttf.jpg");\r
+ if ("SYSTEM".equals(fontName)) {\r
+ typeface = Typeface.DEFAULT;\r
+ } else {\r
+ try {\r
+ typeface = Typeface.createFromAsset(getAssets(), fontName);\r
+ } catch (Exception e) {\r
+ Log.w(LOG, "Exception trying to use typeface, using default.", e);\r
+ Toast.makeText(this, getString(R.string.fontFailure, e.getLocalizedMessage()), Toast.LENGTH_LONG).show();\r
+ }\r
+ }\r
+ if (typeface == null) {\r
+ Log.w(LOG, "Unable to create typeface, using default.");\r
+ typeface = Typeface.DEFAULT;\r
+ }\r
final String fontSize = prefs.getString(getString(R.string.fontSizeKey), "14");\r
try {\r
fontSizeSp = Integer.parseInt(fontSize.trim());\r
} catch (NumberFormatException e) {\r
- fontSizeSp = 12;\r
+ fontSizeSp = 14;\r
}\r
\r
setContentView(R.layout.dictionary_activity);\r
searchText = (EditText) findViewById(R.id.SearchText);\r
+ searchText.setTypeface(typeface);\r
searchText.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);\r
\r
langButton = (Button) findViewById(R.id.LangButton);\r
\r
searchText.requestFocus();\r
searchText.addTextChangedListener(searchTextWatcher);\r
- final String search = prefs.getString(C.SEARCH_TOKEN, "");\r
- searchText.setText(search);\r
- searchText.setSelection(0, search.length());\r
- Log.d(LOG, "Trying to restore searchText=" + search);\r
+ \r
+ // Set the search text from the intent, then the saved state.\r
+ String text = getIntent().getStringExtra(C.SEARCH_TOKEN);\r
+ if (savedInstanceState != null) {\r
+ text = savedInstanceState.getString(C.SEARCH_TOKEN);\r
+ }\r
+ if (text == null) {\r
+ text = "";\r
+ }\r
+ setSearchText(text, true);\r
+ Log.d(LOG, "Trying to restore searchText=" + text);\r
\r
final Button clearSearchTextButton = (Button) findViewById(R.id.ClearSearchTextButton);\r
clearSearchTextButton.setOnClickListener(new OnClickListener() {\r
finish();\r
startActivity(getIntent());\r
}\r
+ if (initialSearchText != null) {\r
+ setSearchText(initialSearchText, true);\r
+ }\r
}\r
\r
@Override\r
prefs.commit();\r
}\r
\r
- private static void clearDictionaryPrefs(final Context context) {\r
- final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(context).edit();\r
- prefs.remove(C.DICT_FILE);\r
- prefs.remove(C.INDEX_INDEX);\r
- prefs.remove(C.SEARCH_TOKEN);\r
- prefs.commit();\r
- }\r
-\r
-\r
@Override\r
protected void onDestroy() {\r
super.onDestroy();\r
if (dictRaf == null) {\r
return;\r
}\r
- \r
+\r
+ final SearchOperation searchOperation = currentSearchOperation;\r
+ currentSearchOperation = null;\r
+\r
// Before we close the RAF, we have to wind the current search down.\r
- if (currentSearchOperation != null) {\r
+ if (searchOperation != null) {\r
Log.d(LOG, "Interrupting search to shut down.");\r
- final SearchOperation searchOperation = currentSearchOperation;\r
currentSearchOperation = null;\r
searchOperation.interrupted.set(true);\r
- synchronized (searchOperation) {\r
- while (!searchOperation.done) {\r
- try {\r
- searchOperation.wait();\r
- } catch (InterruptedException e) {\r
- Log.d(LOG, "Interrupted.", e);\r
- }\r
- }\r
- }\r
}\r
\r
try {\r
// --------------------------------------------------------------------------\r
\r
private void onClearSearchTextButton(final Button clearSearchTextButton) {\r
- clearSearchTextButton.requestFocus();\r
- searchText.setText("");\r
- searchText.requestFocus();\r
+ setSearchText("", true);\r
Log.d(LOG, "Trying to show soft keyboard.");\r
final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);\r
manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT);\r
}\r
\r
void updateLangButton() {\r
- langButton.setText(index.shortName);\r
+// final LanguageResources languageResources = Language.isoCodeToResources.get(index.shortName);\r
+// if (languageResources != null && languageResources.flagId != 0) {\r
+// langButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, languageResources.flagId, 0);\r
+// } else {\r
+// langButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);\r
+ langButton.setText(index.shortName);\r
+// }\r
}\r
\r
void onLanguageButton() {\r
currentSearchOperation.interrupted.set(true);\r
currentSearchOperation = null;\r
}\r
- changeIndex((indexIndex + 1)% dictionary.indices.size());\r
+ changeIndexGetFocusAndResearch((indexIndex + 1)% dictionary.indices.size());\r
}\r
\r
void onLanguageButtonLongClick(final Context context) {\r
dialog.setTitle(R.string.selectDictionary);\r
\r
final List<DictionaryInfo> installedDicts = ((DictionaryApplication)getApplication()).getUsableDicts();\r
+ \r
ListView listView = (ListView) dialog.findViewById(android.R.id.list);\r
+\r
+// final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);\r
+// layoutParams.width = 0;\r
+// layoutParams.weight = 1.0f;\r
+\r
+ final Button button = new Button(listView.getContext());\r
+ final String name = getString(R.string.dictionaryManager);\r
+ button.setText(name);\r
+ final IntentLauncher intentLauncher = new IntentLauncher(listView.getContext(), DictionaryManagerActivity.getLaunchIntent()) {\r
+ @Override\r
+ protected void onGo() {\r
+ dialog.dismiss();\r
+ DictionaryActivity.this.finish();\r
+ };\r
+ };\r
+ button.setOnClickListener(intentLauncher);\r
+// button.setLayoutParams(layoutParams);\r
+ listView.addHeaderView(button);\r
+// listView.setHeaderDividersEnabled(true);\r
+ \r
listView.setAdapter(new BaseAdapter() {\r
@Override\r
public View getView(int position, View convertView, ViewGroup parent) {\r
final LinearLayout result = new LinearLayout(parent.getContext());\r
+\r
final DictionaryInfo dictionaryInfo = getItem(position);\r
- for (int i = 0; i < dictionaryInfo.indexInfos.size(); ++i) {\r
- final IndexInfo indexInfo = dictionaryInfo.indexInfos.get(i);\r
final Button button = new Button(parent.getContext());\r
- String name = application.getLanguageName(indexInfo.shortName);\r
- if (name == null) {\r
- name = indexInfo.shortName;\r
- }\r
+ final String name = application.getDictionaryName(dictionaryInfo.uncompressedFilename);\r
button.setText(name);\r
- final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(), getLaunchIntent(application.getPath(dictionaryInfo.uncompressedFilename), i, "")) {\r
+ final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(), getLaunchIntent(application.getPath(dictionaryInfo.uncompressedFilename), 0, searchText.getText().toString())) {\r
@Override\r
protected void onGo() {\r
dialog.dismiss();\r
};\r
};\r
button.setOnClickListener(intentLauncher);\r
- \r
final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);\r
layoutParams.width = 0;\r
layoutParams.weight = 1.0f;\r
button.setLayoutParams(layoutParams);\r
-\r
result.addView(button);\r
- }\r
return result;\r
}\r
\r
}\r
\r
\r
- private void changeIndex(final int newIndex) {\r
+ private void changeIndexGetFocusAndResearch(final int newIndex) {\r
indexIndex = newIndex;\r
index = dictionary.indices.get(indexIndex);\r
indexAdapter = new IndexAdapter(index);\r
Log.d(LOG, "onUpDownButton, destIndexEntry=" + dest.token);\r
searchText.removeTextChangedListener(searchTextWatcher);\r
searchText.setText(dest.token);\r
- Selection.moveToRightEdge(searchText.getText(), searchText.getLayout());\r
+ if (searchText.getLayout() != null) {\r
+ // Surprising, but this can otherwise crash sometimes...\r
+ Selection.moveToRightEdge(searchText.getText(), searchText.getLayout());\r
+ }\r
jumpToRow(index.sortedIndexEntries.get(destIndexEntry).startRow);\r
searchText.addTextChangedListener(searchTextWatcher);\r
}\r
// Options Menu\r
// --------------------------------------------------------------------------\r
\r
+ final Random random = new Random();\r
+ \r
@Override\r
public boolean onCreateOptionsMenu(final Menu menu) {\r
application.onCreateGlobalOptionsMenu(this, menu);\r
\r
+ {\r
+ final MenuItem randomWord = menu.add(getString(R.string.randomWord));\r
+ randomWord.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
+ public boolean onMenuItemClick(final MenuItem menuItem) {\r
+ final String word = index.sortedIndexEntries.get(random.nextInt(index.sortedIndexEntries.size())).token;\r
+ setSearchText(word, true);\r
+ return false;\r
+ }\r
+ });\r
+ }\r
+ \r
{\r
final MenuItem dictionaryList = menu.add(getString(R.string.dictionaryManager));\r
dictionaryList.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
dialog.setTitle(name);\r
\r
final StringBuilder builder = new StringBuilder();\r
- final DictionaryInfo dictionaryInfo = Dictionary.getDictionaryInfo(dictFile);\r
+ final DictionaryInfo dictionaryInfo = dictionary.getDictionaryInfo();\r
+ dictionaryInfo.uncompressedBytes = dictFile.length();\r
if (dictionaryInfo != null) {\r
builder.append(dictionaryInfo.dictInfo).append("\n\n");\r
builder.append(getString(R.string.dictionaryPath, dictFile.getPath())).append("\n");\r
builder.append(getString(R.string.indexName, indexInfo.shortName)).append("\n");\r
builder.append(getString(R.string.mainTokenCount, indexInfo.mainTokenCount)).append("\n");\r
}\r
- } else {\r
- builder.append(getString(R.string.invalidDictionary));\r
+ builder.append("\n");\r
+ builder.append(getString(R.string.sources)).append("\n");\r
+ for (final EntrySource source : dictionary.sources) {\r
+ builder.append(getString(R.string.sourceInfo, source.getName(), source.getNumEntries())).append("\n");\r
+ }\r
}\r
+// } else {\r
+// builder.append(getString(R.string.invalidDictionary));\r
+// }\r
textView.setText(builder.toString());\r
\r
dialog.show();\r
final MenuItem searchForSelection = menu.add(getString(R.string.searchForSelection, selectedSpannableText));\r
searchForSelection.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
public boolean onMenuItemClick(MenuItem item) {\r
- if (indexIndex != selectedSpannableIndex) {\r
- changeIndex(selectedSpannableIndex);\r
+ int indexToUse = -1;\r
+ for (int i = 0; i < dictionary.indices.size(); ++i) {\r
+ final Index index = dictionary.indices.get(i);\r
+ if (indexPrepFinished) {\r
+ System.out.println("Doing index lookup: on " + selectedText);\r
+ final IndexEntry indexEntry = index.findExact(selectedText);\r
+ if (indexEntry != null) {\r
+ final TokenRow tokenRow = index.rows.get(indexEntry.startRow).getTokenRow(false);\r
+ if (tokenRow != null && tokenRow.hasMainEntry) {\r
+ indexToUse = i;\r
+ break;\r
+ }\r
+ }\r
+ } else {\r
+ Log.w(LOG, "Skipping findExact on index " + index.shortName);\r
+ }\r
}\r
- setSearchText(selectedText);\r
+ if (indexToUse == -1) {\r
+ indexToUse = selectedSpannableIndex;\r
+ }\r
+ final boolean changeIndex = indexIndex != indexToUse;\r
+ setSearchText(selectedText, !changeIndex); // If we're not changing index, we have to triggerSearch.\r
+ if (changeIndex) {\r
+ changeIndexGetFocusAndResearch(indexToUse);\r
+ }\r
+ // Give focus back to list view because typing is done.\r
+ getListView().requestFocus();\r
return false;\r
}\r
});\r
public boolean onKeyDown(final int keyCode, final KeyEvent event) {\r
if (event.getUnicodeChar() != 0) {\r
if (!searchText.hasFocus()) {\r
- setSearchText("" + (char) event.getUnicodeChar());\r
+ setSearchText("" + (char) event.getUnicodeChar(), true);\r
}\r
return true;\r
}\r
if (keyCode == KeyEvent.KEYCODE_BACK) {\r
- Log.d(LOG, "Clearing dictionary prefs.");\r
- DictionaryActivity.clearDictionaryPrefs(this);\r
+ //Log.d(LOG, "Clearing dictionary prefs.");\r
+ // Pretend that we just autolaunched so that we won't do it again.\r
+ //DictionaryManagerActivity.lastAutoLaunchMillis = System.currentTimeMillis();\r
}\r
if (keyCode == KeyEvent.KEYCODE_ENTER) {\r
Log.d(LOG, "Trying to hide soft keyboard.");\r
return super.onKeyDown(keyCode, event);\r
}\r
\r
- private void setSearchText(final String text) {\r
+ private void setSearchText(final String text, final boolean triggerSearch) {\r
+ if (!triggerSearch) {\r
+ getListView().requestFocus();\r
+ }\r
searchText.setText(text);\r
searchText.requestFocus();\r
- onSearchTextChange(searchText.getText().toString());\r
- Selection.moveToRightEdge(searchText.getText(), searchText.getLayout());\r
+ moveCursorToRight();\r
+ if (triggerSearch) {\r
+ onSearchTextChange(text);\r
+ }\r
+ }\r
+ \r
+ private long cursorDelayMillis = 100;\r
+ private void moveCursorToRight() {\r
+ if (searchText.getLayout() != null) {\r
+ cursorDelayMillis = 100;\r
+ // Surprising, but this can crash when you rotate...\r
+ Selection.moveToRightEdge(searchText.getText(), searchText.getLayout());\r
+ } else {\r
+ uiHandler.postDelayed(new Runnable() {\r
+ @Override\r
+ public void run() {\r
+ moveCursorToRight();\r
+ }\r
+ }, cursorDelayMillis);\r
+ cursorDelayMillis = Math.min(10 * 1000, 2 * cursorDelayMillis);\r
+ }\r
}\r
\r
\r
}\r
});\r
}\r
+ } catch (Exception e) {\r
+ Log.e(LOG, "Failure during search (can happen during Activity close.");\r
} finally {\r
synchronized (this) {\r
done = true;\r
}\r
\r
@Override\r
- public View getView(int position, final View convertView, ViewGroup parent) {\r
+ public TableLayout getView(int position, View convertView, ViewGroup parent) {\r
+ final TableLayout result;\r
+ if (convertView instanceof TableLayout) {\r
+ result = (TableLayout) convertView;\r
+ result.removeAllViews();\r
+ } else {\r
+ result = new TableLayout(parent.getContext());\r
+ }\r
final RowBase row = getItem(position);\r
if (row instanceof PairEntry.Row) {\r
- return getView(position, (PairEntry.Row) row, parent, convertView);\r
+ return getView(position, (PairEntry.Row) row, parent, result);\r
} else if (row instanceof TokenRow) {\r
- return getView((TokenRow) row, parent, convertView);\r
+ return getView((TokenRow) row, parent, result);\r
} else {\r
throw new IllegalArgumentException("Unsupported Row type: " + row.getClass());\r
}\r
}\r
\r
- private View getView(final int position, PairEntry.Row row, ViewGroup parent, final View convertView) {\r
- final TableLayout result = new TableLayout(parent.getContext());\r
+ private TableLayout getView(final int position, PairEntry.Row row, ViewGroup parent, final TableLayout result) {\r
final PairEntry entry = row.getEntry();\r
final int rowCount = entry.pairs.size();\r
+ \r
+ final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams();\r
+ layoutParams.weight = 0.5f;\r
+ \r
for (int r = 0; r < rowCount; ++r) {\r
final TableRow tableRow = new TableRow(result.getContext());\r
\r
final TextView col1 = new TextView(tableRow.getContext());\r
final TextView col2 = new TextView(tableRow.getContext());\r
- final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams();\r
- layoutParams.weight = 0.5f;\r
\r
// Set the columns in the table.\r
if (r > 0) {\r
\r
// Set what's in the columns.\r
\r
- // TODO: color words by gender\r
final Pair pair = entry.pairs.get(r);\r
final String col1Text = index.swapPairEntries ? pair.lang2 : pair.lang1;\r
final String col2Text = index.swapPairEntries ? pair.lang1 : pair.lang2;\r
createTokenLinkSpans(col1, col1Spannable, col1Text);\r
createTokenLinkSpans(col2, (Spannable) col2.getText(), col2Text);\r
\r
+ col1.setTypeface(typeface);\r
+ col2.setTypeface(typeface);\r
col1.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);\r
col2.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);\r
// col2.setBackgroundResource(theme.otherLangBg);\r
col2.setOnLongClickListener(textViewLongClickListenerIndex1);\r
}\r
\r
- // Because we have a Button inside a ListView row:\r
- // http://groups.google.com/group/android-developers/browse_thread/thread/3d96af1530a7d62a?pli=1\r
- result.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);\r
- result.setClickable(true);\r
- result.setFocusable(true);\r
- result.setLongClickable(true);\r
- result.setBackgroundResource(android.R.drawable.menuitem_background);\r
- result.setOnClickListener(new TextView.OnClickListener() {\r
- @Override\r
- public void onClick(View v) {\r
- DictionaryActivity.this.onListItemClick(null, v, position, position);\r
- }\r
- });\r
- \r
result.addView(tableRow);\r
}\r
\r
- return result;\r
+ // Because we have a Button inside a ListView row:\r
+ // http://groups.google.com/group/android-developers/browse_thread/thread/3d96af1530a7d62a?pli=1\r
+ result.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);\r
+ result.setClickable(true);\r
+ result.setFocusable(true);\r
+ result.setLongClickable(true);\r
+ result.setBackgroundResource(android.R.drawable.menuitem_background);\r
+ result.setOnClickListener(new TextView.OnClickListener() {\r
+ @Override\r
+ public void onClick(View v) {\r
+ DictionaryActivity.this.onListItemClick(getListView(), v, position, position);\r
+ }\r
+ });\r
\r
- \r
-// final WebView result = (WebView) (convertView instanceof WebView ? convertView : new WebView(parent.getContext()));\r
-// \r
-// final PairEntry entry = row.getEntry();\r
-// final int rowCount = entry.pairs.size();\r
-// final StringBuilder html = new StringBuilder();\r
-// html.append("<html><body><table width=\"100%\">");\r
-// for (int r = 0; r < rowCount; ++r) {\r
-// html.append("<tr>");\r
-//\r
-// final Pair pair = entry.pairs.get(r);\r
-// // TODO: escape both the token and the text.\r
-// final String token = row.getTokenRow(true).getToken();\r
-// final String col1Text = index.swapPairEntries ? pair.lang2 : pair.lang1;\r
-// final String col2Text = index.swapPairEntries ? pair.lang1 : pair.lang2;\r
-// \r
-// col1Text.replaceAll(token, String.format("<b>%s</b>", token));\r
-//\r
-// // Column1\r
-// html.append("<td width=\"50%\">");\r
-// if (r > 0) {\r
-// html.append("<li>");\r
-// }\r
-// html.append(col1Text);\r
-// html.append("</td>");\r
-//\r
-// // Column2\r
-// html.append("<td width=\"50%\">");\r
-// if (r > 0) {\r
-// html.append("<li>");\r
-// }\r
-// html.append(col2Text);\r
-// html.append("</td>");\r
-//\r
-//// column1.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);\r
-//// column2.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);\r
-//\r
-// html.append("</tr>");\r
-// }\r
-// html.append("</table></body></html>");\r
-// \r
-// Log.i(LOG, html.toString());\r
-// \r
-// result.getSettings().setRenderPriority(RenderPriority.HIGH);\r
-// result.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);\r
-// \r
-// result.loadData("<html><body><table><tr><td>line (connected series of public conveyances, and hence, an established arrangement for forwarding merchandise, etc.) (noun)</td><td>verbinding</td></tr></table></body></html>", "text/html", "utf-8");\r
-//\r
-// return result;\r
+ return result;\r
}\r
\r
- private View getView(TokenRow row, ViewGroup parent, final View convertView) {\r
+ private TableLayout getView(TokenRow row, ViewGroup parent, final TableLayout result) {\r
final Context context = parent.getContext();\r
final TextView textView = new TextView(context);\r
textView.setText(row.getToken());\r
- textView.setBackgroundResource(row.hasMainEntry ? theme.tokenRowMainBg : theme.tokenRowOtherBg);\r
// Doesn't work:\r
//textView.setTextColor(android.R.color.secondary_text_light);\r
textView.setTextAppearance(context, theme.tokenRowFg);\r
+ textView.setTypeface(typeface);\r
textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 5 * fontSizeSp / 4);\r
- return textView;\r
+ \r
+ final TableRow tableRow = new TableRow(result.getContext());\r
+ tableRow.addView(textView);\r
+ tableRow.setBackgroundResource(row.hasMainEntry ? theme.tokenRowMainBg : theme.tokenRowOtherBg);\r
+ result.addView(tableRow);\r
+ return result;\r
}\r
\r
}\r
\r
- static final Pattern CHAR_DASH = Pattern.compile("['\\p{L}0-9]+");\r
+ static final Pattern CHAR_DASH = Pattern.compile("['\\p{L}\\p{M}\\p{N}]+");\r
\r
private void createTokenLinkSpans(final TextView textView, final Spannable spannable, final String text) {\r
// Saw from the source code that LinkMovementMethod sets the selection!\r
// --------------------------------------------------------------------------\r
\r
void onSearchTextChange(final String text) {\r
+ if ("thadolina".equals(text)) {\r
+ final Dialog dialog = new Dialog(getListView().getContext());\r
+ dialog.setContentView(R.layout.thadolina_dialog);\r
+ dialog.setTitle("Ti amo, amore mio!");\r
+ final ImageView imageView = (ImageView) dialog.findViewById(R.id.thadolina_image);\r
+ imageView.setOnClickListener(new OnClickListener() {\r
+ @Override\r
+ public void onClick(View v) {\r
+ final Intent intent = new Intent(Intent.ACTION_VIEW);\r
+ intent.setData(Uri.parse("https://sites.google.com/site/cfoxroxvday/vday2012"));\r
+ startActivity(intent);\r
+ }\r
+ });\r
+ dialog.show();\r
+ }\r
if (dictRaf == null) {\r
Log.d(LOG, "searchText changed during shutdown, doing nothing.");\r
return;\r
projects / Dictionary.git / blobdiff