Removed font stuff, added notes. Added language names to what's new.

[Dictionary.git] / src / com / hughes / android / dictionary / HtmlDisplayActivity.java

diff --git a/src/com/hughes/android/dictionary/HelpActivity.java b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
similarity index 53%
rename from src/com/hughes/android/dictionary/HelpActivity.java
rename to src/com/hughes/android/dictionary/HtmlDisplayActivity.java
index e4f3de61724e7e49cd33a061bcd84b1151a1020a..265f470443193961177a6348dc09f9c77db45d28 100644 (file)
--- a/src/com/hughes/android/dictionary/HelpActivity.java
+++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
@@ -14,18 +14,31 @@
 \r
 package com.hughes.android.dictionary;\r
 \r
-import com.hughes.util.StringUtil;\r
-\r
 import android.app.Activity;\r
 import android.content.Intent;\r
 import android.os.Bundle;\r
+import android.view.View;\r
+import android.view.View.OnClickListener;\r
 import android.webkit.WebView;\r
+import android.widget.Button;\r
 \r
-public final class HelpActivity extends Activity {\r
+import com.hughes.util.StringUtil;\r
+\r
+public final class HtmlDisplayActivity extends Activity {\r
+  \r
+  static final String HTML_RES = "html_res";\r
   \r
-  public static Intent getLaunchIntent() {\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
+\r
+  public static Intent getWhatsNewLaunchIntent() {\r
     final Intent intent = new Intent();\r
-    intent.setClassName(HelpActivity.class.getPackage().getName(), HelpActivity.class.getName());\r
+    intent.setClassName(HtmlDisplayActivity.class.getPackage().getName(), HtmlDisplayActivity.class.getName());\r
+    intent.putExtra(HTML_RES, R.raw.whats_new);\r
     return intent;\r
   }\r
 \r
@@ -36,9 +49,18 @@ public final class HelpActivity extends Activity {
 \r
     super.onCreate(savedInstanceState);\r
     setContentView(R.layout.help_activity);\r
-    final String html = StringUtil.readToString(getResources().openRawResource(R.raw.help));\r
-    final WebView webView = (WebView) findViewById(R.id.helpWebView);\r
+    final int htmlRes = getIntent().getIntExtra(HTML_RES, -1);\r
+    final String html = StringUtil.readToString(getResources().openRawResource(htmlRes));\r
+    final WebView webView = (WebView) findViewById(R.id.webView);\r
     webView.loadData(html, "text/html", "utf-8");\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
   }\r
 \r
 }\r