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 #2093: [Mobile-Landscape] High-fi StoryActivity Updated UI #2201

Closed
wants to merge 4 commits into from

Conversation

ReCodee
Copy link

@ReCodee ReCodee commented Dec 1, 2020

Explanation

Fixes #2093

Screenshots

Screenshot_2020-12-01-16-13-31-391_org oppia android

Screenshot_2020-12-01-16-12-36-344_org oppia android

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The PR follows the style guide.
  • The PR does not contain any unnecessary auto-generated code from Android Studio.
  • The PR is made from a branch that's not called "develop".
  • The PR is made from a branch that is up-to-date with "develop".
  • The PR's branch is based on "develop" and not on any other branch.
  • The PR is assigned to an appropriate reviewer in both the Assignees and the Reviewers sections.

@anandwana001
Copy link
Contributor

You can check and setup ktlint on your local machine, this will prevent the GitHub check failures.
https://github.com/oppia/oppia-android/wiki/Ktlint-Guide

@anandwana001
Copy link
Contributor

@ReCodee I suggest to setup Macros, this is fix all issue in just one shortcut.
Please check here - https://github.com/oppia/oppia-android/wiki/Ktlint-Guide#macros

Copy link
Contributor

@anandwana001 anandwana001 left a comment

Choose a reason for hiding this comment

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

Formating suggestion, @ReCodee

storyItemViewModel.name
)
}
binding.storyChapterCard.strokeWidth = when (
Copy link
Contributor

Choose a reason for hiding this comment

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

 binding.storyChapterCard.strokeWidth =
            when (storyItemViewModel.chapterSummary.chapterPlayState) {
              ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ->
                view.context.resources.getDimension(R.dimen.space_0dp).toInt()
              else ->
                view.context.resources.getDimension(R.dimen.story_chapter_stroke_width).toInt()
            }

Copy link
Contributor

Choose a reason for hiding this comment

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

You are getting the indentation issue. Please use the Reformat Code or Macros as per the suggestion to fix the issue.

binding.storyChapterCard.strokeWidth =
  when (storyItemViewModel.chapterSummary.chapterPlayState) {
    ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES ->
      view.context.resources.getDimension(R.dimen.space_0dp).toInt()
    else ->
      view.context.resources.getDimension(R.dimen.story_chapter_stroke_width).toInt()
  }

entityType,
storyItemViewModel.storyId,
imageCenterAlign = true
).parseOppiaHtml(
Copy link
Contributor

Choose a reason for hiding this comment

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

).parseOppiaHtml(
    str,
    binding.chapterTitle
)

@anandwana001
Copy link
Contributor

@ReCodee Any update on this?

@ReCodee
Copy link
Author

ReCodee commented Dec 8, 2020

Will reopen this when ci check fails are resolved.

@ReCodee ReCodee closed this Dec 8, 2020
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.

[Mobile-Landscape] High-fi StoryActivity Updated UI
2 participants