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 part of #41: Hifi Story List #615

Merged
merged 6 commits into from
Jan 21, 2020
Merged

Fix part of #41: Hifi Story List #615

merged 6 commits into from
Jan 21, 2020

Conversation

Luffy18346
Copy link
Contributor

Explanation

Fix part of #41: Changes UI of Story header and story list item in StoryList

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.

@rt4914 rt4914 self-assigned this Jan 21, 2020
rt4914
rt4914 suggested changes Jan 21, 2020
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.

@Luffy18346 PTAL

app/src/main/res/layout/story_chapter_view.xml Show resolved Hide resolved
app/src/main/res/layout/story_chapter_view.xml Outdated Show resolved Hide resolved
@rt4914
Copy link
Contributor

rt4914 commented Jan 21, 2020

@Luffy18346 please add the final screenshot of your work in the description of the PR.

@rt4914 rt4914 assigned Luffy18346 and unassigned rt4914 Jan 21, 2020
@rt4914
Copy link
Contributor

rt4914 commented Jan 21, 2020

@Luffy18346 One more change, the tick mark used in develop code is different than the tick mark in mocks.

Update the tick mark in chapter_completed_tick. You can use tick mark from android-assets.

@Luffy18346
Copy link
Contributor Author

These are final screenshots of the work

updateImage1

updateImage2

updateImage3

rt4914
rt4914 suggested changes Jan 21, 2020
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.

Just one more change, remove the unused ic_check_primary icon.

rt4914
rt4914 suggested changes Jan 21, 2020
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.

Please remove auto-changed code.

.idea/misc.xml Outdated
@@ -6,4 +6,4 @@
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>
</project>
Copy link
Contributor

Choose a reason for hiding this comment

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

Revert these file changes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changes reverted in this file.

.idea/inspectionProfiles/Project_Default.xml Outdated
<option name="myName" value="Project Default" />
<inspection_tool class="IncorrectScope" enabled="false" level="ERROR" enabled_by_default="false" />
</profile>
</component>
Copy link
Contributor

Choose a reason for hiding this comment

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

Revert these file changes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This file is removed.

.idea/codeStyles/Project.xml Outdated
@@ -157,4 +162,4 @@
</indentOptions>
</codeStyleSettings>
</code_scheme>
</component>
</component>
Copy link
Contributor

Choose a reason for hiding this comment

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

Revert these file changes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changes reverted in this file.

app/src/main/res/layout/story_chapter_view.xml Show resolved Hide resolved
@rt4914
Copy link
Contributor

rt4914 commented Jan 21, 2020

@Luffy18346 always make sure that before your PR gets closed or merged you have replied to all the conversations and resolved all conversations.

rt4914
rt4914 approved these changes Jan 21, 2020
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 8ebd05b into oppia:develop Jan 21, 2020
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

@Luffy18346 Luffy18346

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Luffy18346 @rt4914