Implemented 'about'-Activity

5 files changed, 62 insertions, 12 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 842240a9d..52a15e8ed 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -124,6 +124,7 @@
                     android:scheme="flattr4j" />
             </intent-filter>
         </activity>
+        <activity android:label="@string/about_pref" android:name=".activity.AboutActivity" android:theme="@style/Theme.Sherlock.Light.NoActionBar"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/res/layout/about.xml b/res/layout/about.xml
new file mode 100644
index 000000000..acde9d786
--- /dev/null
+++ b/res/layout/about.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <WebView
+        android:id="@+id/webvAbout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index daf6511df..ef8d7a299 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -44,8 +44,7 @@
         </Preference>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/other_pref" >
-        <Preference android:title="@string/version_pref" />
-        <Preference android:title="@string/about_pref" />
+        <Preference android:title="@string/about_pref" android:key="prefAbout"/>
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/de/danoeh/antennapod/activity/AboutActivity.java b/src/de/danoeh/antennapod/activity/AboutActivity.java
new file mode 100644
index 000000000..625ef6c99
--- /dev/null
+++ b/src/de/danoeh/antennapod/activity/AboutActivity.java
@@ -0,0 +1,23 @@
+package de.danoeh.antennapod.activity;
+
+import android.os.Bundle;
+import android.webkit.WebView;
+
+import com.actionbarsherlock.app.SherlockActivity;
+
+import de.danoeh.antennapod.R;
+
+/** Displays the 'about' screen */
+public class AboutActivity extends SherlockActivity {
+
+	private WebView webview;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.about);		
+		webview = (WebView) findViewById(R.id.webvAbout);
+		webview.loadUrl("file:///android_asset/about.html");
+	}
+
+}
diff --git a/src/de/danoeh/antennapod/activity/PreferenceActivity.java b/src/de/danoeh/antennapod/activity/PreferenceActivity.java
index 374443103..0b947eb90 100644
--- a/src/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/src/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -1,5 +1,6 @@
 package de.danoeh.antennapod.activity;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
@@ -18,6 +19,7 @@ public class PreferenceActivity extends SherlockPreferenceActivity {
 	private static final String PREF_FLATTR_THIS_APP = "prefFlattrThisApp";
 	private static final String PREF_FLATTR_AUTH = "pref_flattr_authenticate";
 	private static final String PREF_FLATTR_REVOKE = "prefRevokeAccess";
+	private static final String PREF_ABOUT = "prefAbout";
 
 	@SuppressWarnings("deprecation")
 	@Override
@@ -34,16 +36,29 @@ public class PreferenceActivity extends SherlockPreferenceActivity {
 						return true;
 					}
 				});
-		findPreference(PREF_FLATTR_REVOKE).setOnPreferenceClickListener(new OnPreferenceClickListener() {
-
-			@Override
-			public boolean onPreferenceClick(Preference preference) {
-				FlattrUtils.revokeAccessToken(PreferenceActivity.this);
-				checkItemVisibility();
-				return true;
-			}
-			
-		});
+		findPreference(PREF_FLATTR_REVOKE).setOnPreferenceClickListener(
+				new OnPreferenceClickListener() {
+
+					@Override
+					public boolean onPreferenceClick(Preference preference) {
+						FlattrUtils.revokeAccessToken(PreferenceActivity.this);
+						checkItemVisibility();
+						return true;
+					}
+
+				});
+
+		findPreference(PREF_ABOUT).setOnPreferenceClickListener(
+				new OnPreferenceClickListener() {
+
+					@Override
+					public boolean onPreferenceClick(Preference preference) {
+						PreferenceActivity.this.startActivity(new Intent(
+								PreferenceActivity.this, AboutActivity.class));
+						return true;
+					}
+
+				});
 	}
 
 	@Override