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 #1169: Topic-revision - Tablet (Portrait) (Highfi) #1467

Merged
merged 16 commits into from
Jul 15, 2020
Merged

Fixes #1169: Topic-revision - Tablet (Portrait) (Highfi) #1467

merged 16 commits into from
Jul 15, 2020

Conversation

MohamedMedhat1998
Copy link
Contributor

Explanation

Screenshots

MDPI Emulator (1024x768)

screenshot-2020-07-13_16 56 44 637

screenshot-2020-07-13_16 56 48 58

XHDPI Emulator (2560x1800)

screenshot-2020-07-13_16 53 12 646

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 "Topic-Revision" for tablet - landscape mode
40babcb
@MohamedMedhat1998
-Implemented low-fi UI for "Topic-Revision" for tablet - portrait mode
f66c8bf
@MohamedMedhat1998
-Updated the span_count for Topic-Revision fragment
29e4b9a
@MohamedMedhat1998
-Added robolectric tests for the span_count for Topic-Revision fragment
acc43df
@MohamedMedhat1998
Merge branch 'develop' into t-revision-robolectric
d6860ce
@MohamedMedhat1998
-Removed the unused import in "TopicRevisionFragmentPresenter"
547907e
@MohamedMedhat1998
Merge remote-tracking branch 'origin/t-revision-tablet-land-lowfi' in…
e82b322 
…to t-revision-robolectric
@MohamedMedhat1998
Merge remote-tracking branch 'origin/t-revision-tablet-port-lowfi' in…
5005934 
…to t-revision-robolectric
@MohamedMedhat1998
Merge remote-tracking branch 'origin/develop' into t-revision-robolec…
72da30c 
…tric
@MohamedMedhat1998
-Merged with "Topic-Revision (low-fi) (port)"
7e7ce1c 
-Merged with "Topic-Revision (low-fi) (land)"
@MohamedMedhat1998
-Fixed "StackOverFlow" error in robolectric tests
88698cd
@MohamedMedhat1998
-Removed the unused import
4ea7072
@MohamedMedhat1998
-Implemented high-fi UI for "Topic-Revision" for portrait mode - tablet
187ffaf
@MohamedMedhat1998
Merge remote-tracking branch 'origin/develop' into t-revision-tablet-…
2f08a88 
…port-highfi

# Conflicts (Resolved):
#	app/src/main/java/org/oppia/app/testing/TopicRevisionTestActivity.kt
#	app/src/main/java/org/oppia/app/testing/TopicRevisionTestActivityPresenter.kt
#	app/src/main/java/org/oppia/app/topic/revision/TopicRevisionFragment.kt
#	app/src/main/res/layout-sw600dp-port/topic_revision_fragment.xml
#	app/src/main/res/layout-sw600dp-port/topic_revision_summary_view.xml
#	app/src/test/java/org/oppia/app/testing/TopicRevisionSpanTest.kt
rt4914
rt4914 suggested changes Jul 14, 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 - nit changes.

app/src/main/AndroidManifest.xml Outdated Show resolved Hide resolved
app/src/main/res/layout/activity_topic_revision_test.xml Outdated Show resolved Hide resolved
@rt4914 rt4914 assigned MohamedMedhat1998 and unassigned rt4914 Jul 14, 2020
@MohamedMedhat1998
- Added EOF in Manifest.xml
e95c272 
- Removed the unused file "activity_topic_revision_test"
@rt4914 rt4914 assigned MohamedMedhat1998 and unassigned rt4914 Jul 14, 2020
@MohamedMedhat1998
Copy link
Contributor Author

@rt4914 merging is blocked, can you approve the changes, please?

rt4914
rt4914 approved these changes Jul 14, 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 removed their assignment Jul 14, 2020
@MohamedMedhat1998 MohamedMedhat1998 merged commit 84fb2a8 into develop Jul 15, 2020
@MohamedMedhat1998 MohamedMedhat1998 deleted the t-revision-tablet-port-highfi branch July 15, 2020 06:51
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.

Topic-revision - Tablet (Portrait) (Highfi)
3 participants
@MohamedMedhat1998 @rt4914 @BenHenning