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

Fixes #1213: CompletedStoryList - Tablet (Portrait) (Highfi) #1570

Merged
merged 8 commits into from
Aug 10, 2020
Merged

Fixes #1213: CompletedStoryList - Tablet (Portrait) (Highfi) #1570

merged 8 commits into from
Aug 10, 2020

Conversation

MohamedMedhat1998
Copy link
Contributor

Explanation

Screenshots

MDPI Emulator (1024x768)

screenshot-٢٠٢٠-٠٨-٠٦_٢١ ٥٢ ٥٩ ٦١٦

XHDPI Emulator (2560x1800)

screenshot-٢٠٢٠-٠٨-٠٦_٢١ ٥١ ٢٥ ٤٨٧

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.

@MohamedMedhat1998
-Implemented low-fi UI for "CompletedStoryList" for landscape mode - …
823b96f 
…tablet
@MohamedMedhat1998
-Implemented low-fi UI for "CompletedStoryList" for portrait mode - t…
877f33c 
…ablet
@MohamedMedhat1998
-Implemented high-fi UI for "CompletedStoryList" for portrait mode - …
bff9ed2 
…tablet
@MohamedMedhat1998
Merge remote-tracking branch 'origin/develop' into completed-story-ta…
8217b41 
…blet-port-highfi

# Conflicts (resolved):
#	app/src/main/res/layout-sw600dp-port/completed_story_item.xml
#	app/src/main/res/layout-sw600dp-port/completed_story_list_fragment.xml
#	app/src/main/res/values-land/integers.xml
#	app/src/main/res/values-sw600dp-port/integers.xml
#	app/src/main/res/values/integers.xml
rt4914
rt4914 suggested changes Aug 7, 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.

Everything looks good. Just merge this PR with develop before I approve it.

@rt4914 rt4914 assigned MohamedMedhat1998 and unassigned rt4914 Aug 7, 2020
@MohamedMedhat1998
Merge remote-tracking branch 'origin/develop' into completed-story-ta…
a0b6137 
…blet-port-highfi

# Conflicts (resolved):
#	app/src/main/res/layout-sw600dp-port/completed_story_item.xml
rt4914
rt4914 approved these changes Aug 10, 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

@rt4914 rt4914 assigned MohamedMedhat1998 and unassigned rt4914 Aug 10, 2020
@MohamedMedhat1998 MohamedMedhat1998 merged commit a23b8a0 into develop Aug 10, 2020
@MohamedMedhat1998 MohamedMedhat1998 deleted the completed-story-tablet-port-highfi branch August 10, 2020 10:45
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

@MohamedMedhat1998 MohamedMedhat1998

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

CompletedStoryList - Tablet (Portrait) (Highfi)
2 participants
@MohamedMedhat1998 @rt4914