Merge branch 'master' of https://github.com/commons-app/apps-android-commons

Author: misaochan

app/src/main/java/fr/free/nrw/commons/AboutActivity.java

@@ -6,6 +6,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.Html;
 import android.text.SpannableString;
 import android.text.style.UnderlineSpan;
 import android.util.Log;
@@ -62,6 +63,18 @@ public void onCreate(Bundle savedInstanceState) {
         content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
         faqText.setText(content);
         versionText.setText(BuildConfig.VERSION_NAME);
+        TextView rate_us = findViewById(R.id.about_rate_us);
+        TextView privacy_policy = findViewById(R.id.about_privacy_policy);
+        TextView translate = findViewById(R.id.about_translate);
+        TextView credits = findViewById(R.id.about_credits);
+        TextView faq = findViewById(R.id.about_faq);
+
+        rate_us.setText(Html.fromHtml(getString(R.string.about_rate_us)));
+        privacy_policy.setText(Html.fromHtml(getString(R.string.about_privacy_policy)));
+        translate.setText(Html.fromHtml(getString(R.string.about_translate)));
+        credits.setText(Html.fromHtml(getString(R.string.about_credits)));
+        faq.setText(Html.fromHtml(getString(R.string.about_faq)));
+
         initDrawer();
     }
 

app/src/main/res/layout/activity_about.xml

@@ -111,7 +111,7 @@
                 android:layout_marginTop="@dimen/standard_gap"
                 android:gravity="center"
                 android:textColor="@color/primaryColor"
-                android:text="@string/about_rate_us" />
+                />
 
             <TextView
                 android:id="@+id/about_privacy_policy"
@@ -121,7 +121,7 @@
                 android:layout_marginTop="@dimen/standard_gap"
                 android:textColor="@color/primaryColor"
                 android:gravity="center"
-                android:text="@string/about_privacy_policy" />
+                />
 
             <TextView
                 android:id="@+id/about_translate"
@@ -131,7 +131,7 @@
                 android:textColor="@color/primaryColor"
                 android:layout_marginTop="@dimen/standard_gap"
                 android:gravity="center"
-                android:text="@string/about_translate" />
+                />
 
             <TextView
                 android:id="@+id/about_credits"
@@ -141,7 +141,7 @@
                 android:textColor="@color/primaryColor"
                 android:layout_marginTop="@dimen/standard_gap"
                 android:gravity="center"
-                android:text="@string/about_credits" />
+                />
 
             <TextView
                 android:id="@+id/about_faq"

app/src/main/res/values/strings.xml

@@ -86,8 +86,8 @@
   <string name="about_license">The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. </string>
   <string name="trademarked_name" translatable="false">Wikimedia Commons</string>
   <string name="about_improve">Create a new &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;GitHub issue&lt;/a&gt; for bug reports and suggestions.</string>
-  <string name="about_privacy_policy"><u>Privacy policy</u></string>
-  <string name="about_credits"><u>Credits</u></string>
+  <string name="about_privacy_policy"><![CDATA[<u>Privacy policy</u>]]></string>
+  <string name="about_credits"><![CDATA[<u>Credits</u>]]></string>
   <string name="title_activity_about">About</string>
   <string name="menu_feedback">Send Feedback (via Email)</string>
   <string name="no_email_client">No email client installed</string>
@@ -253,16 +253,16 @@
   <string name="nearby_wikipedia">WIKIPEDIA</string>
   <string name="nearby_commons">COMMONS</string>
 
-  <string name="about_rate_us"><u>Rate us</u></string>
-  <string name="about_faq">FAQ</string>
+  <string name="about_rate_us"><![CDATA[<u>Rate us</u>]]></string>
+  <string name="about_faq"><![CDATA[<u>FAQ</u>]]></string>
   <string name="welcome_skip_button">Skip Tutorial</string>
 
   <string name="no_internet">Internet unavailable</string>
   <string name="internet_established">Internet available</string>
   <string name="error_notifications">Error fetching notifications</string>
   <string name="no_notifications">No notifications found</string>
 
-  <string name="about_translate"><u>Translate</u></string>
+  <string name="about_translate"><![CDATA[<u>Translate</u>]]></string>
   <string name="about_translate_title">Languages</string>
   <string name="about_translate_message">Select the language that you would like to submit translations for</string>
   <string name="about_translate_proceed">Proceed</string>