Fix #5246: "Update the Android FAQ" #5247

deonwaju · 2023-11-28T00:31:18Z

Explanation

Fixes #5246: "Update the Android FAQ"

Changed the order in which the FAQ questions where arranged by refactoring the property name of each string to the appropriate one based on requirements from [Feature Request]: Update the Android FAQ #5246.
Added new questions based on requirements from [Feature Request]: Update the Android FAQ #5246.
Refactored the faq question property names in the tests written in FAQListFragmentTest.kt according to the new order in which the questions where arranged.
Created a string extension file in string extensions to check if string resource contains a placeholder, to be able to dynamically replace the placeholders with the appropriate string values.
Used the string extension to check if any string resource file from the FAQ questions and answers contains a placeholder, then call function to replace placeholder with appropriate string value.

WhatsApp.Video.2023-12-01.at.09.30.07.mp4

WhatsApp.Video.2023-12-01.at.09.30.17.mp4

Essential Checklist

The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
Any changes to scripts/assets files have their rationale included in the PR explanation.
The PR follows the style guide.
The PR does not contain any unnecessary code changes from Android Studio (reference).
The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
The PR is assigned to the appropriate reviewers (reference).

…e with new index of question string.

…nto feature/update_faq

deonwaju · 2023-11-28T01:49:01Z

@adhiamboperes PTAL

…_opensFaqSingleActivity

…OppiaInName_opensFaqSingleActivity

…ionWithOppiaInName_opensFaqSingleActivity

deonwaju · 2023-11-28T19:43:43Z

Hello @adhiamboperes , I want to push this pr as a collaborator but when i cloned i still dont have permission to push my branch

deonwaju · 2023-11-28T20:28:56Z

Hello @adhiamboperes , I want to push this pr as a collaborator but when i cloned i still dont have permission to push my branch

Sorry, I don't understand your question. Could you please clarify what you mean push as a collaborator? Did you re-clone the repo?

Yes i did re-clone the repo, The error is a permission error, I mean i want to push this PR after i clone the original project and not from this forked repo.

adhiamboperes · 2023-11-28T23:18:23Z

Hello @adhiamboperes , I want to push this pr as a collaborator but when i cloned i still dont have permission to push my branch

Sorry, I don't understand your question. Could you please clarify what you mean push as a collaborator? Did you re-clone the repo?

Yes i did re-clone the repo, The error is a permission error, I mean i want to push this PR after i clone the original project and not from this forked repo.

You still need to work on your fork.

deonwaju · 2023-11-28T23:51:54Z

Hello @adhiamboperes , I want to push this pr as a collaborator but when i cloned i still dont have permission to push my branch

Sorry, I don't understand your question. Could you please clarify what you mean push as a collaborator? Did you re-clone the repo?

Yes i did re-clone the repo, The error is a permission error, I mean i want to push this PR after i clone the original project and not from this forked repo.

You still need to work on your fork.

Alright, thanks just clarifying, thought addition to the codebase meant working from within the codebase. I am done with the PR, the last CI that didnt pass is a REGEX error for the word Oppia.

I could solve it by using a placeholder %s but I would mess with the logic below @adhiamboperes

adhiamboperes · 2023-11-29T11:56:37Z

@deonwaju, that particular code is quite brittle, and it would be great if you updated it to support the new required behaviour. We now have two questions/answers with the word Oppia, and more could be added in the future. Also, the indices could change any time, as they have now.

…regex check for placeholders on the list of strings for questionOrAnswers.

…ngExtensions.kt

…nto feature/update_faq

… of code

deonwaju · 2023-11-30T01:33:57Z

@adhiamboperes PTAL

oppiabot · 2023-11-30T01:37:01Z

Unassigning @deonwaju since a re-review was requested. @deonwaju, please make sure you have addressed all review comments. Thanks!

adhiamboperes

Thanks @deonwaju, this LGTM.

What's left here is to add a screen recording to your PR description to make it easy to verify that the questions are indeed in the new expected order.

Also kindly just add a brief explantion of the changes made in this PR(the why and how) based on the issue description.

oppiabot · 2023-12-01T01:50:44Z

Hi @deonwaju, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to ask someone to merge your PR once the CI checks pass and you're happy with it. Thanks!

deonwaju · 2023-12-01T08:49:02Z

@adhiamboperes PTAL

oppiabot · 2023-12-01T08:52:07Z

Unassigning @deonwaju since a re-review was requested. @deonwaju, please make sure you have addressed all review comments. Thanks!

adhiamboperes · 2023-12-01T10:32:21Z

Thanks @deonwaju. This looks great!

@seanlip

## Explanation  Fixes #4527 The [design team](oppia/design-team#75) and the previous [PRs](#5247) addressed various issues and revised the FAQ list. However, @seanlip pointed out in the [discussions](oppia/design-team#75 (comment)) that the FAQ related to updating mobile numbers or email addresses appears inappropriate. After verifying with @adhiamboperes and @BenHenning, the initial commit includes removing [that specific FAQ](https://github.com/oppia/oppia-android/blob/3ced7e14a8bff8c3757ed15a1626b0e63c6ce14d/app/src/main/res/values/strings.xml#L574) ## Essential Checklist  - [x] The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".) - [x] Any changes to [scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets) files have their rationale included in the PR explanation. - [x] The PR follows the [style guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide). - [x] The PR does not contain any unnecessary code changes from Android Studio ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)). - [x] The PR is made from a branch that's **not** called "develop" and is up-to-date with "develop". - [x] The PR is **assigned** to the appropriate reviewers ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)). --------- Co-authored-by: Adhiambo Peres <[email protected]>

deonwaju added 18 commits November 27, 2023 23:11

updated question "how can I create a new profile?" answer.

137918c

added new questions to the strings.xml

b35ef45

numbered strings appropriately

f14c85c

numbered strings appropriately in pt-rBR/strings.xml

f6430fe

numbered strings appropriately in ar/strings.xml

7347c82

numbered strings appropriately in sw/strings.xml

b1f23ae

numbered strings appropriately in pcm-rNG/strings.xml

82aebff

numbered answers appropriately in strings.xml

802356e

numbered answers appropriately in pt-rBR/strings.xml

799d9dd

numbered answers appropriately in ar/strings.xml

ec0ec4f

numbered answers appropriately in sw/strings.xml

d3a2e35

numbered answers appropriately in pcm-rNG/strings.xml

127a094

arranged numbered questions and answers appropriately in strings.xml

ef1a734

added the new questions to faqs.xml

ccfc108

changed value of QUESTION_INDEX_WITH_OPPIA_REFERENCE to 1 to correlat…

78d6fb8

…e with new index of question string.

changed value of QUESTION_INDEX_WITH_OPPIA_REFERENCE to 0 to correlat…

6fc1987

…e with new index of question string.

Merge branch 'develop' of https://github.com/DeonWaju/oppia-android i…

862dcb6

…nto feature/update_faq

made "share feedback" characters bold in faq5

a1d157c

deonwaju requested a review from a team as a code owner November 28, 2023 00:31

deonwaju requested a review from adhiamboperes November 28, 2023 00:31

deonwaju added 2 commits November 28, 2023 02:19

testing if ci failure was due to oppia string format

5957fee

testing if ci failure was due to oppia string format

4c4ae5a

refactor

eb39e0f

oppiabot bot assigned adhiamboperes Nov 28, 2023

deonwaju added 4 commits November 28, 2023 04:48

changed position of openFaqListActivity_selectQuestionWithOppiaInName…

97b337d

…_opensFaqSingleActivity

changed question and answer of openFaqListActivity_selectQuestionWith…

561b011

…OppiaInName_opensFaqSingleActivity

remove changed question and answer of openFaqListActivity_selectQuest…

1651f28

…ionWithOppiaInName_opensFaqSingleActivity

fixing error in ci

572890d

adhiamboperes assigned deonwaju and unassigned adhiamboperes Nov 29, 2023

deonwaju added 5 commits November 29, 2023 22:52

removed the check for specific question index and replaced it with a …

9043e57

…regex check for placeholders on the list of strings for questionOrAnswers.

created a string extension function for checking placeholders in Stri…

7286da7

…ngExtensions.kt

Merge branch 'develop' of https://github.com/DeonWaju/oppia-android i…

3e474e0

…nto feature/update_faq

ordered imports in lexicographic order and reduced character per line…

3a92444

… of code

refactoring

286ba75

oppiabot bot assigned adhiamboperes and unassigned deonwaju Nov 30, 2023

adhiamboperes approved these changes Dec 1, 2023

View reviewed changes

adhiamboperes assigned deonwaju and unassigned adhiamboperes Dec 1, 2023

oppiabot bot added the PR: LGTM label Dec 1, 2023

oppiabot bot assigned adhiamboperes and unassigned deonwaju Dec 1, 2023

adhiamboperes merged commit 176b268 into oppia:develop Dec 1, 2023
40 checks passed

adhiamboperes mentioned this pull request Dec 4, 2023

Localisation updates from https://translatewiki.net. #5258

Merged

deonwaju deleted the feature/update_faq branch December 7, 2023 09:57

Rd4dev mentioned this pull request Feb 4, 2024

Fix #4527: FAQ Inappropriate faqs removed #5332

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #5246: "Update the Android FAQ" #5247

Fix #5246: "Update the Android FAQ" #5247

deonwaju commented Nov 28, 2023 •

edited

Loading

deonwaju commented Nov 28, 2023

deonwaju commented Nov 28, 2023

deonwaju commented Nov 28, 2023 •

edited

Loading

adhiamboperes commented Nov 28, 2023

deonwaju commented Nov 28, 2023 •

edited

Loading

adhiamboperes commented Nov 29, 2023

deonwaju commented Nov 30, 2023

oppiabot bot commented Nov 30, 2023

adhiamboperes left a comment

oppiabot bot commented Dec 1, 2023

deonwaju commented Dec 1, 2023

oppiabot bot commented Dec 1, 2023

adhiamboperes commented Dec 1, 2023

Fix #5246: "Update the Android FAQ" #5247

Fix #5246: "Update the Android FAQ" #5247

Conversation

deonwaju commented Nov 28, 2023 • edited Loading

Explanation

Essential Checklist

deonwaju commented Nov 28, 2023

deonwaju commented Nov 28, 2023

deonwaju commented Nov 28, 2023 • edited Loading

adhiamboperes commented Nov 28, 2023

deonwaju commented Nov 28, 2023 • edited Loading

adhiamboperes commented Nov 29, 2023

deonwaju commented Nov 30, 2023

oppiabot bot commented Nov 30, 2023

adhiamboperes left a comment

Choose a reason for hiding this comment

oppiabot bot commented Dec 1, 2023

deonwaju commented Dec 1, 2023

oppiabot bot commented Dec 1, 2023

adhiamboperes commented Dec 1, 2023

deonwaju commented Nov 28, 2023 •

edited

Loading

deonwaju commented Nov 28, 2023 •

edited

Loading

deonwaju commented Nov 28, 2023 •

edited

Loading