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 #590: Full UI Switch Profile Option #651

Merged
merged 12 commits into from
Feb 13, 2020
Merged

Fix #590: Full UI Switch Profile Option #651

merged 12 commits into from
Feb 13, 2020

Conversation

PrarabdhGarg
Copy link
Contributor

Explanation

Fixes #590
This pull requests adds the switch profile option in the navigation drawer, along with the UI tests associated with it

Checklist

  • [ x] 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: ...".)
  • [x ] The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • [ x] The PR follows the style guide.
  • [x ] The PR does not contain any unnecessary auto-generated code from Android Studio.
  • [ x] The PR is made from a branch that's not called "develop".
  • [x ] The PR is made from a branch that is up-to-date with "develop".
  • [x ] The PR's branch is based on "develop" and not on any other branch.
  • [ x] The PR is assigned to an appropriate reviewer in both the Assignees and the Reviewers sections.

PrarabdhGarg and others added 10 commits January 27, 2020 11:14
@PrarabdhGarg
Merge pull request #1 from oppia/develop
710093a 
Sync forked repository
@PrarabdhGarg
Merge pull request #2 from oppia/develop
dc7bbbb 
Merge
@PrarabdhGarg
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
043184f 
… develop
@Luffy18346 @PrarabdhGarg
Fix oppia#572: Keyboard visible by default in Admin Pin (oppia#573)
52e1eb4 
* By default keyboard visibility issue in Admin Pin is resolved

* Created a test case to check about Keyboard visibility by default in Admin Pin.

* Test is modified with the suggested changes
@veena14cs @PrarabdhGarg
Fix oppia#577: Display profile name on navigation drawer. (oppia#578)
9bbd10b 
* display profile name in navigation drawer

* Updated code implementation

* adding tests

* added testcases

* Update NavigationDrawerFragmentPresenter.kt

* updated nit changes.
@veena14cs @PrarabdhGarg
Fix part oppia#44: Full UI profile pin/password screen. (oppia#597)
efd93c9 
* done ui corrections

* fixed issues.

* Update pin_password_activity.xml

* updated color

* updated icon

* updated pinview shadow

* updated icon color

* changed shadow

* updated mock color

* fix

* Update pin_password_activity.xml

* updated nit change.

* Update pin_password_activity.xml

* removed fixed width

* fixed dimen file changes

* Update dimens.xml
@veena14cs @PrarabdhGarg
Fix part oppia#632: Replace current recyclerview implementation with …
d9d4c8a 
…BindableAdapter usage. (oppia#641)

* working on topic practice.

* reverted

* updated implementation

* Update ContinuePlayingFragmentPresenter.kt

* Update ContinuePlayingFragmentPresenter.kt

* Update ContinuePlayingItemViewModel.kt

* Delete OngoingListAdapter.kt

* nit change

* Update ContinuePlayViewModel.kt

* fixed nit
@PrarabdhGarg
Add UI and finctionality for Switch Profile
876fa4f
@PrarabdhGarg
Add UI Tests for switch profile option in navigation drawer
6207716
@PrarabdhGarg
Add UI Tests for switch profile option in navigation drawer
f0cd65d
@PrarabdhGarg PrarabdhGarg requested a review from rt4914 February 12, 2020 17:13
@PrarabdhGarg
Copy link
Contributor Author

@rt4914 I think this pull request also contains commits that were made when I updated my develop branch. How can I avoid these commits from being a part of my pull request?

@rt4914
Copy link
Contributor

rt4914 commented Feb 13, 2020

@rt4914 I think this pull request also contains commits that were made when I updated my develop branch. How can I avoid these commits from being a part of my pull request?

Actually your branch is 4 commits behind oppia-develop. Because of which you are getting this unnecessary code and also your test cases are failing. I suggest you merge your branch with latest oppia-develop code. It should fix the issue if done correctly.

git checkout fix-590-full-ui-switch-profile-option
git fetch upstream
git merge upstream/develop
If there are any merge conflicts after this step (which they are in NavigationDrawerFragmentPresenter and NavigationDrawerTestActivityTest ), resolve those merge conflicts.
Then add / commit / push your code.

@rt4914 rt4914 assigned PrarabdhGarg and unassigned rt4914 Feb 13, 2020
@PrarabdhGarg PrarabdhGarg assigned rt4914 and unassigned PrarabdhGarg Feb 13, 2020
rt4914
rt4914 suggested changes Feb 13, 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.

Great. This looks really clean. I have just requested some few changes. PTAL

app/src/main/java/org/oppia/app/drawer/NavigationDrawerFragmentPresenter.kt Show resolved Hide resolved
app/src/sharedTest/java/org/oppia/app/testing/NavigationDrawerTestActivityTest.kt Outdated Show resolved Hide resolved
app/src/sharedTest/java/org/oppia/app/testing/NavigationDrawerTestActivityTest.kt Outdated Show resolved Hide resolved
@PrarabdhGarg
Copy link
Contributor Author

@rt4914 I have made the required changes

rt4914
rt4914 approved these changes Feb 13, 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
Copy link
Contributor

rt4914 commented Feb 13, 2020

@PrarabdhGarg before merging this PR, update your PR title to

Fix #590: Full UI Switch Profile Option

@PrarabdhGarg PrarabdhGarg changed the title Fix 590 full ui switch profile option Fix 590: Full UI Switch Profile Option Feb 13, 2020
@PrarabdhGarg
Copy link
Contributor Author

@PrarabdhGarg before merging this PR, update your PR title to

Fix #590: Full UI Switch Profile Option

@rt4914 Done

@rt4914
Copy link
Contributor

rt4914 commented Feb 13, 2020

@PrarabdhGarg before merging this PR, update your PR title to
Fix #590: Full UI Switch Profile Option

@rt4914 Done

Actually you missed out #, this is important as it automatically closes the corresponding issue.

@PrarabdhGarg PrarabdhGarg changed the title Fix 590: Full UI Switch Profile Option Fix #590: Full UI Switch Profile Option Feb 13, 2020
@rt4914 rt4914 merged commit 018f06f into oppia:develop Feb 13, 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

@rt4914 rt4914

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Full UI: Switch Profile Option in Navigation Drawer
4 participants
@PrarabdhGarg @rt4914 @Luffy18346 @veena14cs