X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FHtmlDisplayActivity.java;h=70593563c8638af1cb9dcea0cc4a1cfcf1cd7ea1;hb=3d72bc11d5ef9d58e62b5beb4e33a437da28d4b8;hp=9ed14543b7c6cd57dd463a1746aefa8e0e4fcb20;hpb=4a0a832b09c2e1c189701b4b9e2529b37592e0b0;p=Dictionary.git

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