Fix #5246: "Update the Android FAQ"

app/src/main/java/org/oppia/android/app/help/faq/FAQListViewModel.kt

@@ -7,6 +7,7 @@ import org.oppia.android.app.help.faq.faqItemViewModel.FAQHeaderViewModel
 import org.oppia.android.app.help.faq.faqItemViewModel.FAQItemViewModel
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.app.viewmodel.ObservableViewModel
+import org.oppia.android.util.extensions.containsPlaceholderRegex
 import javax.inject.Inject
 
 /** View model in [FAQListFragment]. */
@@ -28,10 +29,11 @@ class FAQListViewModel @Inject constructor(
 
   private fun retrieveQuestionsOrAnswers(questionsOrAnswers: List<String>): List<String> {
     val appName = resourceHandler.getStringInLocale(R.string.app_name)
-    return questionsOrAnswers.mapIndexed { index, questionOrAnswer ->
-      if (index == QUESTION_INDEX_WITH_OPPIA_REFERENCE) {
-        resourceHandler.formatInLocaleWithWrapping(questionOrAnswer, appName)
-      } else questionOrAnswer
+
+    return questionsOrAnswers.map {
+      if (it.containsPlaceholderRegex())
+        resourceHandler.formatInLocaleWithWrapping(it, appName)
+      else it
     }
   }
 
@@ -40,8 +42,4 @@ class FAQListViewModel @Inject constructor(
 
   private fun retrieveAnswers(): List<String> =
     retrieveQuestionsOrAnswers(resourceHandler.getStringArrayInLocale(R.array.faq_answers))
-
-  private companion object {
-    private const val QUESTION_INDEX_WITH_OPPIA_REFERENCE = 3
-  }
 }

app/src/main/res/values-pcm-rNG/strings.xml

@@ -507,22 +507,22 @@
   <string name="terms_of_service_title">Terms of Service</string>
   <string name="agree_to_terms">By using %s, you dey agree to our &lt;br&gt; &lt;oppia-noninteractive-policy link=\"tos\"&gt;Terms of Service&lt;/oppia-noninteractive-policy&gt; and &lt;oppia-noninteractive-policy link=\"privacy\"&gt;Privacy Policy&lt;/oppia-noninteractive-policy&gt;.</string>
   <string name="terms_of_service_web_link">Abeg visit &lt;a href=\"https://www.oppia.org/terms\"&gt;dis page&lt;/a&gt; for di latest version of dese terms.</string>
-  <string name="faq_question_1">How I go fit create a new profile?</string>
-  <string name="faq_question_2">How I go delete a profile?</string>
-  <string name="faq_question_3">How I go take change my email/phone nomba?</string>
-  <string name="faq_question_4">Wetin be %s?</string>
-  <string name="faq_question_5">Who be Administrator?</string>
-  <string name="faq_question_6">Why di Exploration player no dey load?</string>
-  <string name="faq_question_7">Why my audio no dey play?</string>
-  <string name="faq_question_9">I no dey find my question here. What now?</string>
-  <string name="faq_answer_1">&lt;p&gt;If na your first time creating a profile and not have a PIN:&lt;ol&gt;&lt;li&gt;From di Profile Chooser, tap on &lt;strong&gt;Set up Multiple Profiles&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Create a PIN and &lt;strong&gt;Save&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Fill in all boxes for di profile.&lt;ol&gt;&lt;li&gt;(Optional) Upload a photo.&lt;/li&gt;&lt;li&gt;Enter a name.&lt;/li&gt;&lt;li&gt;(Optional) Assign a 3-digit PIN.&lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt;Tap &lt;strong&gt;Create&lt;/strong&gt;. Dis profile go add to your Profile Chooser!&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt; If you don create a profile before and you get a PIN:&lt;ol&gt;&lt;li&gt;From di Profile Chooser, tap on &lt;strong&gt;Add Profile&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Enter your PIN and tap &lt;strong&gt;Submit&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Fill in all boxes for di profile.&lt;ol&gt;&lt;li&gt; (Optional) Upload a photo. &lt;/li&gt;&lt;li&gt; Enter a name. &lt;/li&gt;&lt;li&gt; (Optional) Assign a 3-digit PIN. &lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt;Tap &lt;strong&gt;Create&lt;/strong&gt;. Dis profile go add to your Profile Chooser!&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;br&gt;&lt;p&gt;Note: Only di &lt;u&gt;Administrator&lt;/u&gt; go dey able to manage profiles.&lt;/p&gt;</string>
-  <string name="faq_answer_2">&lt;p&gt;Once profile don delete:&lt;/p&gt;&lt;ol&gt;&lt;li&gt;Di profile no fit dey recovered. &lt;/li&gt;&lt;li&gt; Profile information such as name, photos, and progress go permanently delete. &lt;/li&gt;&lt;/ol&gt;&lt;p&gt;To delete a profile (excluding the &lt;u&gt;Administrator\'s&lt;/u&gt;):&lt;/p&gt;&lt;ol&gt;&lt;li&gt; From di Administrator\'s Home Page, tap on di menu button on di top left. &lt;/li&gt;&lt;li&gt;Tap on &lt;strong&gt;Administrator Controls&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Tap on &lt;strong&gt;Edit Profiles&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Tap on di Profile wey you wan delete. &lt;/li&gt;&lt;li&gt;For di bottom of di screen, tap &lt;strong&gt;Profile Deletion&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Tap &lt;strong&gt;Delete&lt;/strong&gt; to confirm deletion. &lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Note: Only di &lt;u&gt;Administrator&lt;/u&gt; go dey able to manage profiles.&lt;/p&gt;</string>
-  <string name="faq_answer_3">&lt;p&gt;To change your email/phone nomba:&lt;/p&gt;&lt;ol&gt;&lt;li&gt;From di Administrator\'s Home Page, tap on di menu button for di top left.&lt;/li&gt;&lt;li&gt;Tap on &lt;strong&gt;Administrator Controls&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Tap on &lt;strong&gt;Edit Account&lt;/strong&gt;.&lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt; &lt;p&gt;If you wan change your email:&lt;/p&gt;&lt;ol&gt;&lt;li&gt;Enter your new email and tap &lt;strong&gt;Save&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;A confirmation link go send to confirm your new email. Di link go expire after 24 hours and you must click on am to be associated with your account.&lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt; &lt;p&gt;If you dey change your phone nomba:&lt;/p&gt;&lt;ol&gt;&lt;li&gt; Enter your new phone nomba and tap &lt;strong&gt;Verify&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt; A code go send to confirm your new nomba. Di code go expire after 5 minutes and you must be enter am in for di new screen to be associated with your account.&lt;/li&gt;&lt;/ol&gt;</string>
-  <string name="faq_answer_4">&lt;p&gt;%1$s &lt;i&gt;\"O-pee-yah\"&lt;/i&gt; (Finnish) - \"to learn\"&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;%1$s\'s mission na to help anyone learn anything dey want in an effective and enjoyable way.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;By creating a set of free, high-quality, demonstrably effective lessons with di help of educators from around di world, %1$s dey aim to provide students with quality education — regardless of where dem dey or di traditional resources wey dem get access to.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;As a student, you fit start your learning adventure by browsing di topics listed on di Home Page!&lt;/p&gt;</string>
-  <string name="faq_answer_5">&lt;p&gt;An Administrator na di main user wey dey manage profiles and settings for every profile on top their account. They fit be your parent, teacher, or guardian wey don create dis profile for you. &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Administrators get di ability to manage profiles, assign PINs, and change other settings under their account. Depending on your profile, Administrator permissions fit dey required for some features such as changing your PIN, and more. &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;To see who your Administrator be, go di Profile Chooser. Di first profile fot di list and get \"Administrator\" written under their name na di Administrator. &lt;/p&gt;</string>
-  <string name="faq_answer_6">&lt;p&gt;If di Exploration Player no dey load&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check to see if di app dey up to date:&lt;/p&gt;&lt;p&gt;&lt;ul&gt;&lt;li&gt; Go to di Play Store and make sure sey di app dey updated to di latest version &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check your internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; If your internet connection dey slow, try re-connecting to your Wi-Fi network or connecting to a different network. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Ask di Administrator to check their device and internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Get di Administrator to troubleshoot using di steps above &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Let us know if you still dey get issues with loading:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Report a problem by contacting us at [email protected]. &lt;/li&gt;&lt;/ul&gt;</string>
-  <string name="faq_answer_7">&lt;p&gt;If your audio no dey play&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check to see if di app dey up to date:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Go to di Play Store and make sure sey di app dey updated to di latest version &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check your internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; If your internet connection dey slow, try re-connecting to your Wi-Fi network or connecting to a different network. Slow internet fit cause di audio to load irregularly, and go make am difficult to play. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Ask di Administrator to check their device and internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Get di Administrator to troubleshoot using di steps for up&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Let us know if you still dey get issues with loading:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Report a problem by contacting us at [email protected]. &lt;/li&gt;&lt;/ul&gt;</string>
-  <string name="faq_answer_9">&lt;p&gt;If you no fit find your question or you go like to report a bug, contact us for [email protected].&lt;/p&gt;</string>
+  <string name="faq_question_3">How I go fit create a new profile?</string>
+  <string name="faq_question_10">How I go delete a profile?</string>
+  <string name="faq_question_11">How I go take change my email/phone nomba?</string>
+  <string name="faq_question_1">Wetin be %s?</string>
+  <string name="faq_question_2">Who be Administrator?</string>
+  <string name="faq_question_8">Why di Exploration player no dey load?</string>
+  <string name="faq_question_9">Why my audio no dey play?</string>
+  <string name="faq_question_14">I no dey find my question here. What now?</string>
+  <string name="faq_answer_3">&lt;p&gt;If na your first time creating a profile and not have a PIN:&lt;ol&gt;&lt;li&gt;From di Profile Chooser, tap on &lt;strong&gt;Set up Multiple Profiles&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Create a PIN and &lt;strong&gt;Save&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Fill in all boxes for di profile.&lt;ol&gt;&lt;li&gt;(Optional) Upload a photo.&lt;/li&gt;&lt;li&gt;Enter a name.&lt;/li&gt;&lt;li&gt;(Optional) Assign a 3-digit PIN.&lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt;Tap &lt;strong&gt;Create&lt;/strong&gt;. Dis profile go add to your Profile Chooser!&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt; If you don create a profile before and you get a PIN:&lt;ol&gt;&lt;li&gt;From di Profile Chooser, tap on &lt;strong&gt;Add Profile&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Enter your PIN and tap &lt;strong&gt;Submit&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Fill in all boxes for di profile.&lt;ol&gt;&lt;li&gt; (Optional) Upload a photo. &lt;/li&gt;&lt;li&gt; Enter a name. &lt;/li&gt;&lt;li&gt; (Optional) Assign a 3-digit PIN. &lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt;Tap &lt;strong&gt;Create&lt;/strong&gt;. Dis profile go add to your Profile Chooser!&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;br&gt;&lt;p&gt;Note: Only di &lt;u&gt;Administrator&lt;/u&gt; go dey able to manage profiles.&lt;/p&gt;</string>
+  <string name="faq_answer_10">&lt;p&gt;Once profile don delete:&lt;/p&gt;&lt;ol&gt;&lt;li&gt;Di profile no fit dey recovered. &lt;/li&gt;&lt;li&gt; Profile information such as name, photos, and progress go permanently delete. &lt;/li&gt;&lt;/ol&gt;&lt;p&gt;To delete a profile (excluding the &lt;u&gt;Administrator\'s&lt;/u&gt;):&lt;/p&gt;&lt;ol&gt;&lt;li&gt; From di Administrator\'s Home Page, tap on di menu button on di top left. &lt;/li&gt;&lt;li&gt;Tap on &lt;strong&gt;Administrator Controls&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Tap on &lt;strong&gt;Edit Profiles&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Tap on di Profile wey you wan delete. &lt;/li&gt;&lt;li&gt;For di bottom of di screen, tap &lt;strong&gt;Profile Deletion&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Tap &lt;strong&gt;Delete&lt;/strong&gt; to confirm deletion. &lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Note: Only di &lt;u&gt;Administrator&lt;/u&gt; go dey able to manage profiles.&lt;/p&gt;</string>
+  <string name="faq_answer_11">&lt;p&gt;To change your email/phone nomba:&lt;/p&gt;&lt;ol&gt;&lt;li&gt;From di Administrator\'s Home Page, tap on di menu button for di top left.&lt;/li&gt;&lt;li&gt;Tap on &lt;strong&gt;Administrator Controls&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Tap on &lt;strong&gt;Edit Account&lt;/strong&gt;.&lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt; &lt;p&gt;If you wan change your email:&lt;/p&gt;&lt;ol&gt;&lt;li&gt;Enter your new email and tap &lt;strong&gt;Save&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;A confirmation link go send to confirm your new email. Di link go expire after 24 hours and you must click on am to be associated with your account.&lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt; &lt;p&gt;If you dey change your phone nomba:&lt;/p&gt;&lt;ol&gt;&lt;li&gt; Enter your new phone nomba and tap &lt;strong&gt;Verify&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt; A code go send to confirm your new nomba. Di code go expire after 5 minutes and you must be enter am in for di new screen to be associated with your account.&lt;/li&gt;&lt;/ol&gt;</string>
+  <string name="faq_answer_1">&lt;p&gt;%1$s &lt;i&gt;\"O-pee-yah\"&lt;/i&gt; (Finnish) - \"to learn\"&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;%1$s\'s mission na to help anyone learn anything dey want in an effective and enjoyable way.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;By creating a set of free, high-quality, demonstrably effective lessons with di help of educators from around di world, %1$s dey aim to provide students with quality education — regardless of where dem dey or di traditional resources wey dem get access to.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;As a student, you fit start your learning adventure by browsing di topics listed on di Home Page!&lt;/p&gt;</string>
+  <string name="faq_answer_2">&lt;p&gt;An Administrator na di main user wey dey manage profiles and settings for every profile on top their account. They fit be your parent, teacher, or guardian wey don create dis profile for you. &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Administrators get di ability to manage profiles, assign PINs, and change other settings under their account. Depending on your profile, Administrator permissions fit dey required for some features such as changing your PIN, and more. &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;To see who your Administrator be, go di Profile Chooser. Di first profile fot di list and get \"Administrator\" written under their name na di Administrator. &lt;/p&gt;</string>
+  <string name="faq_answer_8">&lt;p&gt;If di Exploration Player no dey load&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check to see if di app dey up to date:&lt;/p&gt;&lt;p&gt;&lt;ul&gt;&lt;li&gt; Go to di Play Store and make sure sey di app dey updated to di latest version &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check your internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; If your internet connection dey slow, try re-connecting to your Wi-Fi network or connecting to a different network. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Ask di Administrator to check their device and internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Get di Administrator to troubleshoot using di steps above &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Let us know if you still dey get issues with loading:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Report a problem by contacting us at [email protected]. &lt;/li&gt;&lt;/ul&gt;</string>
+  <string name="faq_answer_9">&lt;p&gt;If your audio no dey play&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check to see if di app dey up to date:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Go to di Play Store and make sure sey di app dey updated to di latest version &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check your internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; If your internet connection dey slow, try re-connecting to your Wi-Fi network or connecting to a different network. Slow internet fit cause di audio to load irregularly, and go make am difficult to play. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Ask di Administrator to check their device and internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Get di Administrator to troubleshoot using di steps for up&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Let us know if you still dey get issues with loading:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Report a problem by contacting us at [email protected]. &lt;/li&gt;&lt;/ul&gt;</string>
+  <string name="faq_answer_14">&lt;p&gt;If you no fit find your question or you go like to report a bug, contact us for [email protected].&lt;/p&gt;</string>
   <string name="profile_edit_fragment_test_activity_label">Profile Edit Fragment Test Activity</string>
   <string name="administrator_controls_fragment_test_activity_label">Administrator Controls Fragment Test Activity</string>
   <string name="revision_navigation_cards_header">Continue Studying</string>