volatile boolean ttsReady;
Typeface typeface;
- C.Theme theme = C.Theme.LIGHT;
+ DictionaryApplication.Theme theme = DictionaryApplication.Theme.LIGHT;
int textColorFg = Color.BLACK;
int fontSizeSp;
public DictionaryActivity() {
}
- public static Intent getLaunchIntent(final File dictFile, final String indexShortName,
+ public static Intent getLaunchIntent(Context c, final File dictFile, final String indexShortName,
final String searchToken) {
- final Intent intent = new Intent();
- intent.setClassName(DictionaryActivity.class.getPackage().getName(),
- DictionaryActivity.class.getName());
+ final Intent intent = new Intent(c, DictionaryActivity.class);
intent.putExtra(C.DICT_FILE, dictFile.getPath());
intent.putExtra(C.INDEX_SHORT_NAME, indexShortName);
intent.putExtra(C.SEARCH_TOKEN, searchToken);
outState.putString(C.SEARCH_TOKEN, searchView.getQuery().toString());
}
- @Override
- protected void onRestoreInstanceState(final Bundle savedInstanceState) {
- super.onRestoreInstanceState(savedInstanceState);
- Log.d(LOG, "onRestoreInstanceState: " + savedInstanceState.getString(C.SEARCH_TOKEN));
- onCreate(savedInstanceState);
- }
-
@Override
public void onCreate(Bundle savedInstanceState) {
// This needs to be before super.onCreate, otherwise ActionbarSherlock
// Don't auto-launch if this fails.
prefs.edit().remove(C.DICT_FILE).commit();
+ setContentView(R.layout.dictionary_activity);
application = (DictionaryApplication) getApplication();
theme = application.getSelectedTheme();
if (dictFilename == null)
{
Toast.makeText(this, getString(R.string.no_dict_file), Toast.LENGTH_LONG).show();
- startActivity(DictionaryManagerActivity.getLaunchIntent());
+ startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()));
finish();
return;
}
}
Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()),
Toast.LENGTH_LONG).show();
- startActivity(DictionaryManagerActivity.getLaunchIntent());
+ startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()));
finish();
return;
}
}
}).start();
- String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.ttf.jpg");
+ 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) {
fontSizeSp = 14;
}
- setContentView(R.layout.dictionary_activity);
-
// ContextMenu.
registerForContextMenu(getListView());
final int width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 300,
getResources().getDisplayMetrics());
final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
- width, ViewGroup.LayoutParams.WRAP_CONTENT);
+ ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
customSearchView.setLayoutParams(layoutParams);
listView.setOnItemClickListener(new OnItemClickListener() {
final String name = getString(R.string.dictionaryManager);
button.setText(name);
final IntentLauncher intentLauncher = new IntentLauncher(listView.getContext(),
- DictionaryManagerActivity.getLaunchIntent()) {
+ DictionaryManagerActivity.getLaunchIntent(getApplicationContext())) {
@Override
protected void onGo() {
dialog.dismiss();
final View button = application.createButton(parent.getContext(),
dictionaryInfo, indexInfo);
final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(),
- getLaunchIntent(
+ getLaunchIntent(getApplicationContext(),
application.getPath(dictionaryInfo.uncompressedFilename),
indexInfo.shortName, searchView.getQuery().toString())) {
@Override
MenuItemCompat.setShowAsAction(dictionaryManager, MenuItem.SHOW_AS_ACTION_NEVER);
dictionaryManager.setOnMenuItemClickListener(new OnMenuItemClickListener() {
public boolean onMenuItemClick(final MenuItem menuItem) {
- startActivity(DictionaryManagerActivity.getLaunchIntent());
+ startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()));
finish();
return false;
}
String html = HtmlEntry.htmlBody(htmlEntries, index.shortName);
// Log.d(LOG, "html=" + html);
startActivityForResult(
- HtmlDisplayActivity.getHtmlIntent(String.format(
+ HtmlDisplayActivity.getHtmlIntent(getApplicationContext(), String.format(
"<html><head></head><body>%s</body></html>", html),
htmlTextToHighlight, false),
0);