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 part of #1824: Add chapter dash line #3863

Merged
merged 59 commits into from
Oct 22, 2021
Merged

Conversation

viktoriias
Copy link
Contributor

@viktoriias viktoriias commented Sep 30, 2021

Explanation

Fix #1824.
This is the updated copy of #3066

What's new:

  • Minor UI adjustments
  • Added a separate activity and layout for ImageViewBindingAdaptersTest.
  • Introduce a dedicated BUILD.bazel file for the new test suite, and then set up a genrule to replace the import of the adapters with the _updated variant.

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

@viktoriias viktoriias changed the title Patch. Fix part of #1824 Oct 1, 2021
@viktoriias viktoriias marked this pull request as ready for review October 1, 2021 00:30
@viktoriias
Copy link
Contributor Author

@rt4914 @BenHenning Please review.

@BenHenning
Copy link
Sponsor Member

BenHenning commented Oct 5, 2021

Thanks @viktoriias. Sorry for not following up on Friday. I'll need one more day before I can take a look at this. In the mean time, could you resolve the conflicts & merge in the latest develop changes?

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.

Looks really nice. Please make following changes:

  1. Add Fix part of #1824 in description
  2. Add mobile/tablet scrrenshots in various configurations.

Otherwise LGTM

@rt4914 rt4914 assigned viktoriias and anandwana001 and unassigned rt4914 Oct 5, 2021
@viktoriias
Copy link
Contributor Author

Phone (no change):

@viktoriias
Copy link
Contributor Author

Tablet:

@viktoriias
Copy link
Contributor Author

Looks really nice. Please make following changes:

  1. Add Fix part of #1824 in description
  2. Add mobile/tablet scrrenshots in various configurations.

Otherwise LGTM

Done and done. Thanks!

@viktoriias viktoriias removed their assignment Oct 5, 2021
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 @viktoriias! This does look quite nice.

Had a couple of comments, plus a few additional questions:

  1. Can you please update the PR description to explain what's left in Lowfi: Tablet: StoryActivity Landscape + Portrait #1824 after this is merged?
  2. Follow-up from (1), do we still need to implement the empty circles & later dashed lines per the mocks for not-yet-completed chapters, or should that be completed in this PR? I'm asking because per your screenshots it seems that the line doesn't go to the bottom of the chapter list yet,
  3. Follow-up from (3), if this isn't complete yet, we should hide it behind a platform parameter flag until it's ready to be enabled (just to avoid a half-complete thing being merged)
  4. Was Lowfi: Tablet: StoryActivity Landscape + Portrait #1824 (comment) accounted for in this PR, or would that happen in a follow-up?
  5. Could you please update this PR with the latest develop & resolve the conflict?

@BenHenning BenHenning assigned viktoriias and unassigned BenHenning Oct 6, 2021
@BenHenning
Copy link
Sponsor Member

Sorry, will need to review this tomorrow.

@BenHenning
Copy link
Sponsor Member

Also @viktoriias there are failing CI checks--are they related to the latest changes?

@viktoriias
Copy link
Contributor Author

Also @viktoriias there are failing CI checks--are they related to the latest changes?

StateFragmentLocalTest is failing and it doesn't seem related.

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 @viktoriias. Just had a few follow-up comments, otherwise this is looking really good.

Re: the failure, it's probably #2844 and unrelated to this PR. Just to be sure, though, I re-ran the workflow to see if it will now pass.

@BenHenning BenHenning assigned viktoriias and unassigned BenHenning Oct 21, 2021
@BenHenning
Copy link
Sponsor Member

BenHenning commented Oct 21, 2021

Hmm it failed again, interesting. @viktoriias does it pass for you locally without issue? If possible, could you try running the same set of tests as the failing shard to see if that also passes for you? Specifically:

bazel test --keep_going -- //app:src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest //app:src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressActivityTest //app:src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest //app:src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest //app:src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest //app:src/sharedTest/java/org/oppia/android/app/customview/LessonThumbnailImageViewTest //app:src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerActivityTest //app:src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest //app:src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest //app:src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityTest //app/src/test/java/org/oppia/android/app/activity:ActivityIntentFactoriesTest //app:src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest //app:src/sharedTest/java/org/oppia/android/app/options/AudioLanguageFragmentTest //app:src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest //app:src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListFragmentTest

If this is CI-specific, we may need to introduce a retry mechanism also on the run step (which I've been considering to work around this specific flake). I can do that in a separate PR, but I first want to see if this is specific to CI.

@viktoriias
Copy link
Contributor Author

Hmm it failed again, interesting. @viktoriias does it pass for you locally without issue? If possible, could you try running the same set of tests as the failing shard to see if that also passes for you? Specifically:

bazel test --keep_going -- //app:src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest //app:src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressActivityTest //app:src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest //app:src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest //app:src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest //app:src/sharedTest/java/org/oppia/android/app/customview/LessonThumbnailImageViewTest //app:src/sharedTest/java/org/oppia/android/app/thirdparty/LicenseTextViewerActivityTest //app:src/sharedTest/java/org/oppia/android/app/devoptions/MarkChaptersCompletedActivityTest //app:src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest //app:src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityTest //app/src/test/java/org/oppia/android/app/activity:ActivityIntentFactoriesTest //app:src/sharedTest/java/org/oppia/android/app/topic/lessons/TopicLessonsFragmentTest //app:src/sharedTest/java/org/oppia/android/app/options/AudioLanguageFragmentTest //app:src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest //app:src/sharedTest/java/org/oppia/android/app/thirdparty/ThirdPartyDependencyListFragmentTest

If this is CI-specific, we may need to introduce a retry mechanism also on the run step (which I've been considering to work around this specific flake). I can do that in a separate PR, but I first want to see if this is specific to CI.

Checks are passing now

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 @viktoriias. This looks really good!

@BenHenning BenHenning changed the title Fix part of #1824 Fix part of #1824: Add chapter dash line Oct 22, 2021
@BenHenning
Copy link
Sponsor Member

Merging since approvals seem complete & CI is passing.

@BenHenning BenHenning merged commit a0769cc into oppia:develop Oct 22, 2021
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.

Lowfi: Tablet: StoryActivity Landscape + Portrait
5 participants