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.

Sign up for GitHub

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

Jump to bottom

Fix #2093: [Mobile-Landscape] High-fi StoryActivity Updated UI #3802

Merged
merged 3 commits into from
Sep 21, 2021
Merged

Fix #2093: [Mobile-Landscape] High-fi StoryActivity Updated UI #3802

merged 3 commits into from
Sep 21, 2021

Conversation

viktoriias
Copy link
Contributor

@viktoriias viktoriias commented Sep 16, 2021 •
edited

Explanation

Fixes #2093: [Mobile-Landscape] High-fi StoryActivity Updated UI

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 marked this pull request as draft September 16, 2021 03:44
@viktoriias
Copy link
Contributor Author

viktoriias commented Sep 16, 2021 •
edited

@viktoriias viktoriias changed the title 2093 Fix #2093: [Mobile-Landscape] High-fi StoryActivity Updated UI Sep 16, 2021
@viktoriias viktoriias marked this pull request as ready for review September 16, 2021 04:39
rt4914
rt4914 suggested changes Sep 20, 2021
View reviewed 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.

@viktoriias Left one comment.

app/src/main/res/layout-land/story_chapter_view.xml Outdated
@@ -32,7 +32,9 @@
android:clickable="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES}"
android:onClick="@{(v) -> viewModel.onExplorationClicked()}"
app:cardCornerRadius="4dp"
app:cardElevation="@{viewModel.chapterSummary.chapterPlayState != ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ? @dimen/story_chapter_card_playable_state_elevation : @dimen/story_chapter_card_not_playable_state_elevation}">
app:cardElevation="@dimen/story_chapter_card_playable_state_elevation"
app:strokeColor="@color/colorPrimary"
Copy link
Contributor

Choose a reason for hiding this comment

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

This is not fixed. If the card is locked then this border is grey. Check Chapter-3 in this mock. https://xd.adobe.com/view/ee9e607b-dbd6-4372-48dc-b687d32af3da-98af/screen/cce938d6-e079-4761-bac0-8bde22ac6348/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't notice that at all, sorry about that. Added grey border and updated screenshot above.

@rt4914 rt4914 assigned viktoriias and unassigned rt4914 Sep 20, 2021
@viktoriias viktoriias assigned rt4914 and unassigned viktoriias Sep 20, 2021
rt4914
rt4914 approved these changes Sep 21, 2021
View reviewed 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.

LGTM, thanks.

@rt4914 rt4914 merged commit 87125aa into oppia:develop Sep 21, 2021
@viktoriias viktoriias deleted the 2093 branch September 21, 2021 23:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rt4914 rt4914 rt4914 approved these changes

Assignees

@rt4914 rt4914

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Mobile-Landscape] High-fi StoryActivity Updated UI
3 participants
@viktoriias @rt4914 @Viktoriia-Lozova