add FAQ link to about activity

3 files changed, 36 insertions, 13 deletions

diff --git a/main/res/layout/about_activity.xml b/main/res/layout/about_activity.xml
index 542b2fd..4afb8a6 100644
--- a/main/res/layout/about_activity.xml
+++ b/main/res/layout/about_activity.xml
@@ -113,6 +113,22 @@
             </RelativeLayout>
 
             <TextView
+                android:id="@+id/faq"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:clickable="true"
+                android:focusable="true"
+                android:linksClickable="false"
+                android:text="@string/faq"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+
+            <TextView
                 android:id="@+id/support"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 236d87c..e15ec2d 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -1139,7 +1139,8 @@
     <string name="nutshellmanual">Manual: <a href="">c:geo in a Nutshell</a></string>
     <string name="market">Android: <a href="">c:geo on Google Play</a></string>
     <string name="about_twitter">Should <b>c:geo</b> publish a new status on Twitter every time you log a cache?</string>
-
+    <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string>
+    
     <!-- status (used via string based resource loading) -->
     <string name="status_new_release" tools:ignore="UnusedResources">New release available.\nClick to install.</string>
     <string name="status_new_nightly" tools:ignore="UnusedResources">New nightly build available.\nClick to install.</string>
diff --git a/main/src/cgeo/geocaching/AboutActivity.java b/main/src/cgeo/geocaching/AboutActivity.java
index 14786ec..029249e 100644
--- a/main/src/cgeo/geocaching/AboutActivity.java
+++ b/main/src/cgeo/geocaching/AboutActivity.java
@@ -19,19 +19,20 @@ import android.widget.TextView;
 
 @EActivity
 public class AboutActivity extends AbstractActivity {
+
     @ViewById(R.id.about_version_string) protected TextView version;
     @ViewById(R.id.contributors) protected TextView contributors;
     @ViewById(R.id.changelog_master) protected TextView changeLogMaster;
-
     @ViewById(R.id.changelog_release) protected TextView changeLogRelease;
+
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(final Bundle savedInstanceState) {
         // TODO remove this after the theme has been fixed
         super.onCreate(savedInstanceState, R.layout.about_activity);
     }
 
     @AfterViews
-    void initializeViews() {
+    final void initializeViews() {
         version.setText(Version.getVersionName(this));
         contributors.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
         changeLogRelease.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
@@ -44,45 +45,50 @@ public class AboutActivity extends AbstractActivity {
     }
 
     @Click(R.id.donate)
-    public void donate() {
+    final void donate() {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FMLNN8GXZKJEE")));
     }
 
     @Click(R.id.support)
-    public void support() {
+    final void support() {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("mailto:support@cgeo.org")));
     }
 
-
     @Click(R.id.website)
-    void webSite() {
+    final void webSite() {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.cgeo.org/")));
     }
 
     @Click(R.id.facebook)
-    public void facebook() {
+    final void facebook() {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.facebook.com/pages/cgeo/297269860090")));
     }
 
     @Click(R.id.twitter)
-    public void twitter() {
+    final void twitter() {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://twitter.com/android_gc")));
     }
 
     @Click(R.id.nutshellmanual)
-    public void nutshellmanual() {
+    final void nutshellmanual() {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://manual.cgeo.org/")));
     }
 
     @Click(R.id.market)
-    public void market() {
+    final void market() {
         final Intent marketIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + getPackageName()));
         marketIntent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
         startActivity(marketIntent);
     }
 
     @Click(R.id.license)
-    public void license() {
+    final void license() {
         startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.apache.org/licenses/LICENSE-2.0.html")));
     }
+
+    @Click(R.id.faq)
+    final void faq() {
+        startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://faq.cgeo.org/")));
+    }
+
 }