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 #2192: Fixes delete profile in tablet #2195

Merged
merged 6 commits into from
Dec 4, 2020
Merged

Fix #2192: Fixes delete profile in tablet #2195

merged 6 commits into from
Dec 4, 2020

Conversation

FareesHussain
Copy link
Contributor

@FareesHussain FareesHussain commented Nov 30, 2020 •
edited by anandwana001
Loading

Explanation

Fixes #2192

  • Fixed with minimum changes possible.
  • Added tests which pass for both Espresso and Robolectric and fails without my implementation
  • Changed the intent from ProfileListActivity to AdministratorControlsActivity
  • Changing to intent to AdministratorControlsActivity take to ProfileListActivity with Administrator Control displayed

image

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.

@FareesHussain
Copy link
Contributor Author

@anandwana001 please check

anandwana001
anandwana001 suggested changes Nov 30, 2020
View reviewed changes
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.

@FareesHussain Did a pass on test file. PTAL

app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt Show resolved Hide resolved
app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt Outdated Show resolved Hide resolved
anandwana001
anandwana001 suggested changes Nov 30, 2020
View reviewed changes
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.

Thanks @FareesHussain
Few updates, PTAL

app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt Show resolved Hide resolved
app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt Show resolved Hide resolved
app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt Show resolved Hide resolved
anandwana001
anandwana001 approved these changes Dec 1, 2020
View reviewed changes
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.

LGTM, Thanks @FareesHussain
Defer to @rt4914 for further merge

@FareesHussain
Copy link
Contributor Author

@rt4914 please check

rt4914
rt4914 approved these changes Dec 4, 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 33f4736 into oppia:develop Dec 4, 2020
@rt4914
Copy link
Contributor

rt4914 commented Dec 4, 2020

@FareesHussain Thanks a lot for finding this issues, filing this issue and solving this issue. Much appreciated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anandwana001 anandwana001 anandwana001 approved these changes

@rt4914 rt4914 rt4914 approved these changes

Assignees

@rt4914 rt4914

@FareesHussain FareesHussain

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Profile Deletion in Tablet opens a different layout
3 participants
@FareesHussain @rt4914 @anandwana001