From ede8c76d4593ae0381b568f4021f49d429135406 Mon Sep 17 00:00:00 2001
From: Ujjwal Agrawal <ujjwal.iitism@gmail.com>
Date: Sun, 11 Mar 2018 13:28:26 +0530
Subject: [PATCH] Faqs added in About Activity (#1256)

* Faqs added in About Activity

* Added CDATA in strings

* removed cdata, added SpannableString
---
 .../main/java/fr/free/nrw/commons/AboutActivity.java | 12 +++++++++++-
 app/src/main/res/layout/activity_about.xml           | 10 ++++++++++
 app/src/main/res/values/strings.xml                  |  3 ++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
index bb7b1fc1e..97fe27aa4 100644
--- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
@@ -4,6 +4,8 @@ import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.style.UnderlineSpan;
 import android.util.Log;
 import android.support.customtabs.CustomTabsIntent;
 import android.support.v4.content.ContextCompat;
@@ -25,6 +27,7 @@ import static android.widget.Toast.LENGTH_SHORT;
 public class AboutActivity extends NavigationBaseActivity {
     @BindView(R.id.about_version) TextView versionText;
     @BindView(R.id.about_license) HtmlTextView aboutLicenseText;
+    @BindView(R.id.about_faq) TextView faqText;
 
     /**
      * This method helps in the creation About screen
@@ -40,7 +43,9 @@ public class AboutActivity extends NavigationBaseActivity {
         ButterKnife.bind(this);
         String aboutText = getString(R.string.about_license);
         aboutLicenseText.setHtmlText(aboutText);
-
+        SpannableString content = new SpannableString(getString(R.string.about_faq));
+        content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
+        faqText.setText(content);
         versionText.setText(BuildConfig.VERSION_NAME);
         initDrawer();
     }
@@ -113,4 +118,9 @@ public class AboutActivity extends NavigationBaseActivity {
         }
     }
 
+    @OnClick(R.id.about_faq)
+    public void launchFrequentlyAskedQuesions(View view) {
+        Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Frequently-Asked-Questions\\"));
+    }
+
 }
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 00c7fa5b8..f4a295d95 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -133,6 +133,16 @@
                 android:gravity="center"
                 android:text="@string/about_credits" />
 
+            <TextView
+                android:id="@+id/about_faq"
+                style="?android:textAppearanceSmall"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/primaryColor"
+                android:layout_marginTop="@dimen/standard_gap"
+                android:gravity="center"
+                />
+
             <TextView
                 android:id="@+id/about_uploads_to"
                 style="?android:textAppearanceSmall"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2aa47bcfd..4b343bce2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -243,5 +243,6 @@
   <string name="notifications_mention">%1$s mentioned you on %2$s.</string>
   <string name="toggle_view_button">Toggle view</string>
   <string name="about_rate_us"><u>Rate Us</u></string>
-    <string name="welcome_skip_button">Skip Tutorial</string>
+  <string name="about_faq">Frequently Asked Questions</string>
+  <string name="welcome_skip_button">Skip Tutorial</string>
 </resources>