\r
package com.hughes.android.dictionary;\r
\r
-import android.app.Activity;\r
import android.content.Intent;\r
import android.os.Bundle;\r
import android.util.Log;\r
import android.view.View;\r
import android.view.View.OnClickListener;\r
-import android.webkit.WebView;\r
import android.widget.Button;\r
\r
+import com.actionbarsherlock.app.ActionBar;\r
+import com.actionbarsherlock.app.SherlockActivity;\r
import com.hughes.util.StringUtil;\r
\r
-public final class HtmlDisplayActivity extends Activity {\r
- \r
- static final String LOG = "QuickDic";\r
+public final class HtmlDisplayActivity extends SherlockActivity {\r
\r
- \r
- static final String HTML_RES = "html_res";\r
- static final String HTML = "html";\r
- static final String TEXT_TO_HIGHLIGHT = "textToHighlight";\r
- static final String SHOW_OK_BUTTON = "showOKButton";\r
- \r
- public static Intent getHelpLaunchIntent() {\r
- final Intent intent = new Intent();\r
- intent.setClassName(HtmlDisplayActivity.class.getPackage().getName(), HtmlDisplayActivity.class.getName());\r
- intent.putExtra(HTML_RES, R.raw.help);\r
- return intent;\r
- }\r
+ static final String LOG = "QuickDic";\r
\r
- public static Intent getWhatsNewLaunchIntent() {\r
- final Intent intent = new Intent();\r
- intent.setClassName(HtmlDisplayActivity.class.getPackage().getName(), HtmlDisplayActivity.class.getName());\r
- intent.putExtra(HTML_RES, R.raw.whats_new);\r
- return intent;\r
- }\r
+ static final String HTML_RES = "html_res";\r
+ static final String HTML = "html";\r
+ static final String TEXT_TO_HIGHLIGHT = "textToHighlight";\r
+ static final String SHOW_OK_BUTTON = "showOKButton";\r
\r
- public static Intent getHtmlIntent(final String html, final String textToHighlight, final boolean showOkButton) {\r
- final Intent intent = new Intent();\r
- intent.setClassName(HtmlDisplayActivity.class.getPackage().getName(), HtmlDisplayActivity.class.getName());\r
- intent.putExtra(HTML, html);\r
- intent.putExtra(TEXT_TO_HIGHLIGHT, textToHighlight);\r
- intent.putExtra(SHOW_OK_BUTTON, showOkButton);\r
- return intent;\r
- }\r
-\r
- /** Called when the activity is first created. */\r
- @Override\r
- public void onCreate(final Bundle savedInstanceState) {\r
- setTheme(((DictionaryApplication)getApplication()).getSelectedTheme().themeId);\r
+ public static Intent getHelpLaunchIntent() {\r
+ final Intent intent = new Intent();\r
+ intent.setClassName(HtmlDisplayActivity.class.getPackage().getName(),\r
+ HtmlDisplayActivity.class.getName());\r
+ intent.putExtra(HTML_RES, R.raw.help);\r
+ return intent;\r
+ }\r
\r
- super.onCreate(savedInstanceState);\r
- setContentView(R.layout.html_display_activity);\r
- \r
- final int htmlRes = getIntent().getIntExtra(HTML_RES, -1);\r
- final String html;\r
- if (htmlRes != -1) {\r
- html = StringUtil.readToString(getResources().openRawResource(htmlRes));\r
- } else {\r
- html = getIntent().getStringExtra(HTML);\r
+ public static Intent getWhatsNewLaunchIntent() {\r
+ final Intent intent = new Intent();\r
+ intent.setClassName(HtmlDisplayActivity.class.getPackage().getName(),\r
+ HtmlDisplayActivity.class.getName());\r
+ intent.putExtra(HTML_RES, R.raw.whats_new);\r
+ return intent;\r
}\r
- final WebView webView = (WebView) findViewById(R.id.webView);\r
- webView.loadData(html, "text/html", "utf-8");\r
- \r
- final String textToHighlight = getIntent().getStringExtra(TEXT_TO_HIGHLIGHT);\r
- if (textToHighlight != null && !"".equals(textToHighlight)) {\r
- Log.d(LOG, "Highlighting text: " + textToHighlight);\r
- // This isn't working:\r
- webView.findAll(textToHighlight);\r
- //webView.showFindDialog(textToHighlight, false);\r
+\r
+ public static Intent getHtmlIntent(final String html, final String textToHighlight,\r
+ final boolean showOkButton) {\r
+ final Intent intent = new Intent();\r
+ intent.setClassName(HtmlDisplayActivity.class.getPackage().getName(),\r
+ HtmlDisplayActivity.class.getName());\r
+ intent.putExtra(HTML, html);\r
+ intent.putExtra(TEXT_TO_HIGHLIGHT, textToHighlight);\r
+ intent.putExtra(SHOW_OK_BUTTON, showOkButton);\r
+ return intent;\r
}\r
- \r
- final Button okButton = (Button) findViewById(R.id.okButton);\r
- okButton.setOnClickListener(new OnClickListener() {\r
- @Override\r
- public void onClick(View v) {\r
- finish();\r
- }\r
- });\r
- if (!getIntent().getBooleanExtra(SHOW_OK_BUTTON, true)) {\r
- okButton.setVisibility(Button.GONE);\r
+\r
+ /** Called when the activity is first created. */\r
+ @Override\r
+ public void onCreate(final Bundle savedInstanceState) {\r
+ setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);\r
+\r
+ super.onCreate(savedInstanceState);\r
+ setContentView(R.layout.html_display_activity);\r
+ \r
+ ActionBar actionBar = getSupportActionBar();\r
+ actionBar.setDisplayHomeAsUpEnabled(true);\r
+\r
+ final int htmlRes = getIntent().getIntExtra(HTML_RES, -1);\r
+ final String html;\r
+ if (htmlRes != -1) {\r
+ html = StringUtil.readToString(getResources().openRawResource(htmlRes));\r
+ } else {\r
+ html = getIntent().getStringExtra(HTML);\r
+ }\r
+ final MyWebView webView = (MyWebView) findViewById(R.id.webView);\r
+ webView.loadData(html, "text/html", "utf-8");\r
+ webView.activity = this;\r
+\r
+ final String textToHighlight = getIntent().getStringExtra(TEXT_TO_HIGHLIGHT);\r
+ if (textToHighlight != null && !"".equals(textToHighlight)) {\r
+ Log.d(LOG, "NOT Highlighting text: " + textToHighlight);\r
+ // This isn't working:\r
+ // webView.findAll(textToHighlight);\r
+ // webView.showFindDialog(textToHighlight, false);\r
+ }\r
+\r
+ final Button okButton = (Button) findViewById(R.id.okButton);\r
+ okButton.setOnClickListener(new OnClickListener() {\r
+ @Override\r
+ public void onClick(View v) {\r
+ finish();\r
+ }\r
+ });\r
+ if (!getIntent().getBooleanExtra(SHOW_OK_BUTTON, true)) {\r
+ okButton.setVisibility(Button.GONE);\r
+ }\r
}\r
- }\r
\r
}\r
projects / Dictionary.git / blobdiff