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 #3755: Administration controls invisible but actionable #4901

Conversation

masclot
Copy link
Collaborator

@masclot masclot commented Mar 14, 2023

Explanation

Fix #3755: AdministratorControlsActivity tablet has Fragment management issues

The "App Version" fragment was being added on top of the previous fragment, instead of replacing it.

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)
  • Add a screenshot demonstrating that you ran affected Espresso tests locally & that they're passing

The following videos show how you can click on a hidden ui control in the current version, but you cannot after the changes in this cl.

current new
current_administration_controls_invisible_but_actionable.webm new_administration_controls_invisible_but_actionable.webm

Screenshot with test failure when app-version goes back to use add fragment, instead of replace fragment.

Test failure when app-version adds fragment, instead of replacing it

@masclot
Copy link
Collaborator Author

masclot commented Mar 14, 2023

@adhiamboperes PTAL

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 @masclot!

Can you add some screenshots or a video since this is a UI issue?

@masclot
Copy link
Collaborator Author

masclot commented Mar 17, 2023

Sure. The video shows how you can click on a hidden ui control in the current version, but you cannot after the changes in this cl.

current new
current_administration_controls_invisible_but_actionable.webm new_administration_controls_invisible_but_actionable.webm

@masclot masclot assigned adhiamboperes and unassigned masclot Mar 17, 2023
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.

Nice catch! This LGTM.

@oppiabot
Copy link

oppiabot bot commented Mar 20, 2023

Unassigning @adhiamboperes since they have already approved the PR.

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 @masclot! I agree--this is a nice find. Two things:

  1. Can you please move the before/after video to the PR description (under the UI section, per its instructions)?
  2. Can you add a test to verify that replace() is being used as expected? This test should fail if you temporarily revert back to 'replace'.

@BenHenning BenHenning assigned masclot and unassigned BenHenning Mar 22, 2023
@masclot
Copy link
Collaborator Author

masclot commented Mar 23, 2023

  • Can you please move the before/after video to the PR description (under the UI section, per its instructions)?
  • Can you add a test to verify that replace() is being used as expected? This test should fail if you temporarily revert back to 'replace'.

Done

@masclot
Copy link
Collaborator Author

masclot commented Mar 23, 2023

@BenHenning PTAL

@oppiabot oppiabot bot assigned BenHenning and unassigned masclot Mar 23, 2023
@oppiabot
Copy link

oppiabot bot commented Mar 23, 2023

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

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 @masclot! The PR LGTM, but can you please include a screenshot showing the test failing when the fix is temporarily reverted (just to demonstrate that it can correctly catch the issue)?

@BenHenning BenHenning removed their assignment Mar 23, 2023
@masclot
Copy link
Collaborator Author

masclot commented Mar 28, 2023

Thanks @masclot! The PR LGTM, but can you please include a screenshot showing the test failing when the fix is temporarily reverted (just to demonstrate that it can correctly catch the issue)?

Screenshot added to the PR description

@masclot
Copy link
Collaborator Author

masclot commented Mar 28, 2023

@BenHenning PTAL

@oppiabot oppiabot bot assigned BenHenning and unassigned masclot Mar 28, 2023
@oppiabot
Copy link

oppiabot bot commented Mar 28, 2023

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

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 @masclot. This LGTM!

@BenHenning
Copy link
Sponsor Member

Syncing with latest develop & enabling auto-merge.

@BenHenning BenHenning enabled auto-merge (squash) March 30, 2023 04:09
@oppiabot
Copy link

oppiabot bot commented Mar 30, 2023

Unassigning @BenHenning since they have already approved the PR.

@oppiabot oppiabot bot added the PR: LGTM label Mar 30, 2023
@oppiabot
Copy link

oppiabot bot commented Mar 30, 2023

Hi @masclot, 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!

@BenHenning BenHenning merged commit cad268b into oppia:develop Mar 30, 2023
Uticodes pushed a commit to Uticodes/oppia-android that referenced this pull request Apr 4, 2023
…ia#4901)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
Fix oppia#3755: AdministratorControlsActivity tablet has Fragment management
issues

The "App Version" fragment was being added on top of the previous
fragment, instead of replacing it.

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [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)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
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](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-(A11y)-Guide))
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing


The following videos show how you can click on a hidden ui control in
the current version, but you cannot after the changes in this cl.
|current|new|
|-|-|

|[current_administration_controls_invisible_but_actionable.webm](https://user-images.githubusercontent.com/103062089/225941610-d41ed412-625c-45de-b18c-3279bd2d2401.webm)|[new_administration_controls_invisible_but_actionable.webm](https://user-images.githubusercontent.com/103062089/225941644-7b3598ba-89c5-4a8b-9611-ecc751ea1b25.webm)|

Screenshot with test failure when app-version goes back to use add
fragment, instead of replace fragment.

![Test failure when app-version adds fragment, instead of replacing
it](https://user-images.githubusercontent.com/103062089/228270103-04a9224e-5ca2-4150-9a8e-abc717972290.png)

---------

Co-authored-by: Ben Henning <ben@oppia.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

AdministratorControlsActivity tablet has Fragment management issues
3 participants