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 #1390: Show terms of service & privacy policy notices. #3852

Merged
merged 575 commits into from
Aug 26, 2022

Conversation

veena14cs
Copy link
Contributor

@veena14cs veena14cs commented Sep 28, 2021

Explanation

Fix #1390

This PR fixes #1390. This PR introduces Privacy Policy and Terms of Service in the app. The PR contains Policies page through onboarding flow and FAQ/Help screens.

This PR also fixes #1022. This PR introduces two new custom tags <oppia-ul> and <oppia-ol> to support html <ul> and <ol> tags respectively. To addon the new custom list tags also supports lower versions devices and nested list tags.

This PR also fixes #2193 RTL issues in Bullet points and fixes the crashes in the issue #2391

Mock Links

Onboarding
Mobile Landscape
Tablet
FAQ and Help
Mobile Landscape
Tablet

Document Reference

https://docs.google.com/document/d/1QoW2S-HGNrQ_6rodOByjGPd8e_w80PHKE3PJ82t1-hE/edit?usp=sharing

Screenshots

Mobile Portrait on Nexus 6

Screenshot_1634630041.....Screenshot_1634949081...Screenshot_1634630033......Screenshot_1634949088

Screenshot_1637266595.....Screenshot_1637266617

Screenshot_1637266577.....Screenshot_1637266625

Screenshot_1634630045.....Screenshot_1634949092

Screenshot_1634948852......Screenshot_1634949016

Screenshot_1634948847....Screenshot_1634949022

Screenshot_1634948856.....Screenshot_1634949010

Tablet :

Screenshot_1635233546....Screenshot_1635233563

Screenshot_1635233541....Screenshot_1635233511

Screenshot_1635233504....Screenshot_1635233521.....Screenshot_1635233492

Screenshot_1642254470.....Screenshot_1642254531

Screenshot_1642254476.....Screenshot_1642254522

Screenshots on Mdpi device

Screenshot_1645212105....Screenshot_1645212130
Screenshot_1659367710......Screenshot_1659367631
Screenshot_1659367721...Screenshot_1659367673

LTR and RTL list Tablet

Screenshot_1659368858......Screenshot_1659368794
Screenshot_1659368868....Screenshot_1659368768

Screenshot_1659368880...Screenshot_1659368682
Screenshot_1659368875....Screenshot_1659368747

LTR Video

Screenrecording_20220309_155903.mp4

RTL Video

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

Known Issues

  • New custom List tag doesn't support RTL

@BenHenning
Copy link
Sponsor Member

@veena14cs I left feedback in chat. Please assign back or ping me if there's anything else you need my thoughts on.

@veena14cs
Copy link
Contributor Author

@veena14cs I left feedback in chat. Please assign back or ping me if there's anything else you need my thoughts on.

Thanks @BenHenning .

@veena14cs veena14cs marked this pull request as draft October 5, 2021 05:23
@oppiabot
Copy link

oppiabot bot commented Oct 13, 2021

Hi @veena14cs, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added stale Corresponds to items that haven't seen a recent update and may be automatically closed. and removed stale Corresponds to items that haven't seen a recent update and may be automatically closed. labels Oct 13, 2021
@veena14cs veena14cs changed the title Fix #1390,#1391: Show terms of service & privacy policy notices [WIP] Fix #1390,#1391: Show terms of service & privacy policy notices. Oct 18, 2021
@veena14cs veena14cs marked this pull request as ready for review October 18, 2021 19:18
@veena14cs veena14cs assigned rt4914 and BenHenning and unassigned veena14cs Oct 20, 2021
@BenHenning
Copy link
Sponsor Member

Thanks @veena14cs! I think I'll need to take a look at this tomorrow my time, but in the meantime:

  1. Can you add screenshots for landscape for all the mocks currently in the opening comment to show how landscape works? Ditto for tablet portrait + landscape.
  2. We need to include links to the web copies of the policies. Are these included? Can you maybe include a video showing navigating to each policy & clicking on the links?
  3. Can you please add a video showing the TalkBack experience for each screen?
  4. CI has failures--can you make sure that these are fixed?

@BenHenning
Copy link
Sponsor Member

Sorry, will need to review this next week. Given that, @veena14cs can you please address all the points in #3852 (comment) & assign back one done?

@BenHenning BenHenning removed their assignment Oct 22, 2021
@veena14cs
Copy link
Contributor Author

Thanks @veena14cs! I think I'll need to take a look at this tomorrow my time, but in the meantime:

  1. Can you add screenshots for landscape for all the mocks currently in the opening comment to show how landscape works? Ditto for tablet portrait + landscape.
  2. We need to include links to the web copies of the policies. Are these included? Can you maybe include a video showing navigating to each policy & clicking on the links?
  3. Can you please add a video showing the TalkBack experience for each screen?
  4. CI has failures--can you make sure that these are fixed?

1- Mobile-landscape and tablet portrait + landscape mocks are not yet provided. I have included landscape screenshots though.
2- I have added link at the bottom of the page for both PP/Tos PTAL in the video.
3- I will have to check on this still.
4- Waiting for the tests to complete.

@veena14cs
Copy link
Contributor Author

Sorry, will need to review this next week. Given that, @veena14cs can you please address all the points in #3852 (comment) & assign back one done?

Thanks for the update @BenHenning . Can you please look at the video once and confirm if its correct. I have added web link for PP/Tos on the Privacy policy and Terms of service page.

Copy link
Contributor

@rt4914 rt4914 left a comment

Choose a reason for hiding this comment

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

@veena14cs I have left comments on overall approach PTAL

@rt4914 rt4914 removed their assignment Oct 22, 2021
@veena14cs veena14cs requested a review from rt4914 October 25, 2021 19:49
@veena14cs veena14cs assigned rt4914 and BenHenning and unassigned veena14cs Oct 25, 2021
@BenHenning
Copy link
Sponsor Member

Sorry, will need to review this next week. Given that, @veena14cs can you please address all the points in #3852 (comment) & assign back one done?

Thanks for the update @BenHenning . Can you please look at the video once and confirm if its correct. I have added web link for PP/Tos on the Privacy policy and Terms of service page.

@veena14cs the videos are flickering really badly and it's making it difficult to evaluate. Can you maybe try to re-record them or check with someone else to see if it works for them? It may be specific to my computer, but I haven't had this issue with other uploaded videos.

Beyond that, I plan to look at this PR in more depth tomorrow.

Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @veena14cs. Took a first pass on nearly everything (skipped verifying the policy text for now, the new html utility, and tests).

My main feedback is that I think we should introduce just a single activity/fragment + presenters for both policies and make them generic. It seems both are basically identical, so the extra boilerplate seems unnecessary. Sharing them will reduce the overall surface being introduced here.

app/build.gradle Outdated Show resolved Hide resolved
app/src/main/AndroidManifest.xml Outdated Show resolved Hide resolved
app/BUILD.bazel Outdated Show resolved Hide resolved
app/src/main/res/layout/privacy_policy_fragment.xml Outdated Show resolved Hide resolved
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
@veena14cs
Copy link
Contributor Author

@BenHenning I have fixed testcases related to canvas. PTAL.

Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @veena14cs! Just had 4 small remaining comments, otherwise the PR LGTM!

@BenHenning BenHenning assigned veena14cs and unassigned BenHenning Aug 24, 2022
@veena14cs veena14cs assigned BenHenning and unassigned veena14cs Aug 24, 2022
@veena14cs veena14cs changed the title Fix #1390, #1391: Show terms of service & privacy policy notices. Fix #1390: Show terms of service & privacy policy notices. Aug 24, 2022
Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @veena14cs. Just a couple more follow-up comments--PTAL.

@BenHenning BenHenning assigned veena14cs and unassigned BenHenning Aug 25, 2022
@veena14cs
Copy link
Contributor Author

Thanks @veena14cs. Just a couple more follow-up comments--PTAL.

I have addressed and fixed the comments. PTAL.

@BenHenning
Copy link
Sponsor Member

Thanks @veena14cs! I have no further comments, so I think we're mainly waiting on CI.

Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @veena14cs! Everything here LGTM! This was a set of gnarly problems, and it's really nice to see all of this come together.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants