Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #5251 Modify Feature Flag Names to reflect those on Oppia Web #5257

Closed
wants to merge 23 commits into from

Conversation

Tejas-67
Copy link
Contributor

@Tejas-67 Tejas-67 commented Dec 4, 2023

Explanation

Modified feature flag names to respective new names as described here.

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).

For UI-specific PRs only

If your PR includes UI-related changes, then:

  • Add screenshots for portrait/landscape for both a tablet & phone of the before & after UI changes
  • For the screenshots above, include both English and pseudo-localized (RTL) screenshots (see RTL guide)
  • Add a video showing the full UX flow with a screen reader enabled (see accessibility guide)
  • For PRs introducing new UI elements or color changes, both light and dark mode screenshots must be included
  • Add a screenshot demonstrating that you ran affected Espresso tests locally & that they're passing

Tejas-67 and others added 23 commits October 29, 2023 11:06
- Replace brittle string manipulation with robust regex matching using .toRegex().find()
- Introduce new helper functions for code simplification
- Replace brittle string manipulation with robust regex matching using .toRegex().find()
- Introduce new helper functions for code simplification
Copy link
Collaborator

@adhiamboperes adhiamboperes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @Tejas-67!

Your changes on the FeatureFlagConstants look good, but the remaining file changes need to be reverted.

Whenever creating a new PR, you should create a new branch based off of the develop branch. You can do this by:

  1. git checkout develop checkout your local develop
  2. git pull upstream develop sync with upstream
  3. git checkout -b new-branch-name create clean branch

In case you had mistakenly made commits on you local develop branch, you can do a hard reset or delete the branch and checkout a clean one from upstream.

Comment on lines +49 to +52
policyDescription = resourceHandler.getStringInLocale(R.string.privacy_policy_content)
policyWebLink = resourceHandler.getStringInLocale(R.string.privacy_policy_web_link)
} else if (policyPage == PolicyPage.TERMS_OF_SERVICE) {
policyDescription =
resourceHandler.getStringInLocale(R.string.terms_of_service_content)
policyDescription = resourceHandler.getStringInLocale(R.string.terms_of_service_content)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes are not related to this PR. Please revert

@@ -236,4 +236,4 @@
<li>26 Sep 2015: Revised terms added.</li>
</ul>
</]]></string>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file change too is not related to this PR.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file should not be part of this PR

@Tejas-67
Copy link
Contributor Author

Tejas-67 commented Dec 4, 2023

@adhiamboperes Okay, I will close this PR and create a fresh one.

@Tejas-67 Tejas-67 closed this Dec 4, 2023
@Tejas-67 Tejas-67 reopened this Dec 4, 2023
@Tejas-67 Tejas-67 closed this Dec 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants