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 #4028: Hi fi profile tablet implement edit profile screen inside a fragment #4029

Merged
merged 165 commits into from
Jun 7, 2022
Merged

Fix #4028: Hi fi profile tablet implement edit profile screen inside a fragment #4029

merged 165 commits into from
Jun 7, 2022

Conversation

yash10019coder
Copy link
Contributor

@yash10019coder yash10019coder commented Dec 6, 2021 •
edited

Explanation

Fixes #4028
Fixes #3242
Fixes #4007

Essential Checklist

  • The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • Any changes to scripts/assets files have their rationale included in the PR explanation.
  • The PR follows the style guide.
  • The PR does not contain any unnecessary code changes from Android Studio (reference).
  • The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
  • The PR is assigned to the appropriate reviewers (reference).

For UI-specific PRs only

If your PR includes UI-related changes, then:

Mobile Screenshots

Old New
Screenshot_20220106_235314 Screenshot_20220106_232411
Screenshot_20220106_235326 Screenshot_20220106_232440
Screenshot_20220106_235337 Screenshot_20220106_232415
Screenshot_20220106_235340 Screenshot_20220106_232652
Screenshot_20220106_235349 Screenshot_20220106_232745
Screenshot_20220106_235353 Screenshot_20220106_232752
Screenshot_20220106_235358 Screenshot_20220106_232758
Screenshot_20220106_235404 Screenshot_20220106_232802
Screenshot_20220106_235407 Screenshot_20220106_232818

Tablet Screenshots

Old New
Screenshot_20220106_234109 New Tab Port
Screenshot_20220106_234119 New Tab Land
Screenshot_20220106_234127 New Tab Admin Port
Screenshot_20220106_234137 New Tablet Admin Land
Screenshot_20220106_234145 New Tablet User Port
Screenshot_20220106_234149 New Tablet User Land

UI Workflow Mobile

oppia-phone-2022-02-08_23.08.12.mp4

UI Workflow Tablet

oppia-tablet-2022-02-08_23.04.40.mp4

AdministratorControlsActivityTest and AdministratorControlsFragmentTest

image
image

@BenHenning BenHenning mentioned this pull request Dec 7, 2021
Closed
yash10019coder
yash10019coder commented Dec 10, 2021
View reviewed changes
Copy link
Contributor Author

@yash10019coder yash10019coder left a comment

Choose a reason for hiding this comment

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

Hi @BenHenning I tried to implement a back stack management so that we can add fragments on the back stack and if back button is pushed then we can simply pop the fragment but this isn't working.
first I tired adding tags tags were properly displayed on the fragments list as I logged it but the backstack size was coming zero
this is the output below for my above run
2021-12-10 14:48:14.134 9140-9140/org.oppia.android I/tag: handleOnBackPressed: ProfileEditFragment{e213891} (224a34e6-8455-4819-805b-bcd6b5be6ba7) id=0x7f090072 ADMINISTRATOR_CONTROLS_BACKSTACK} [NavigationDrawerFragment{48773f6} (fe0c3145-91f3-4383-bed9-d71069c05b9b) id=0x7f090070}, AdministratorControlsFragment{94583f7} (4de28ea0-b6e0-4576-b7c5-d7d3423e41a6) id=0x7f090073 ADMINISTRATOR_CONTROLS_BACKSTACK}, ProfileListFragment{8d8a264} (ba3d3f5a-c561-4f96-bb9f-355b9940abc3) id=0x7f090072 ADMINISTRATOR_CONTROLS_BACKSTACK}, SupportRequestManagerFragment{30fcccd} (9a4b0150-e5f1-4b4c-84dc-4e9555ffcd51) com.bumptech.glide.manager}{parent=null}, ProfileEditFragment{e213891} (224a34e6-8455-4819-805b-bcd6b5be6ba7) id=0x7f090072 ADMINISTRATOR_CONTROLS_BACKSTACK}] 0

...n/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt Outdated Show resolved Hide resolved
...n/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt Outdated Show resolved Hide resolved
...n/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt Outdated Show resolved Hide resolved
...n/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt Outdated Show resolved Hide resolved
@BenHenning
Copy link
Sponsor Member

Hi @BenHenning I tried to implement a back stack management so that we can add fragments on the back stack and if back button is pushed then we can simply pop the fragment but this isn't working. first I tired adding tags tags were properly displayed on the fragments list as I logged it but the backstack size was coming zero this is the output below for my above run 2021-12-10 14:48:14.134 9140-9140/org.oppia.android I/tag: handleOnBackPressed: ProfileEditFragment{e213891} (224a34e6-8455-4819-805b-bcd6b5be6ba7) id=0x7f090072 ADMINISTRATOR_CONTROLS_BACKSTACK} [NavigationDrawerFragment{48773f6} (fe0c3145-91f3-4383-bed9-d71069c05b9b) id=0x7f090070}, AdministratorControlsFragment{94583f7} (4de28ea0-b6e0-4576-b7c5-d7d3423e41a6) id=0x7f090073 ADMINISTRATOR_CONTROLS_BACKSTACK}, ProfileListFragment{8d8a264} (ba3d3f5a-c561-4f96-bb9f-355b9940abc3) id=0x7f090072 ADMINISTRATOR_CONTROLS_BACKSTACK}, SupportRequestManagerFragment{30fcccd} (9a4b0150-e5f1-4b4c-84dc-4e9555ffcd51) com.bumptech.glide.manager}{parent=null}, ProfileEditFragment{e213891} (224a34e6-8455-4819-805b-bcd6b5be6ba7) id=0x7f090072 ADMINISTRATOR_CONTROLS_BACKSTACK}] 0

@yash10019coder I can't be sure what's wrong without actually debugging it, but in principle I actually suggest trying to implement this without using the backstack, if possible. I generally recommend against using the fragment backstack because it can be difficult to get correct, and I've yet to run into a situation where it was actually needed. Generally, the alternatives end up being more predictable and easy to understand, too.

Can you provide a bit more context into what the exact user flow is that you're trying to model?

yash10019coder
yash10019coder commented May 15, 2022
View reviewed changes
Copy link
Contributor Author

@yash10019coder yash10019coder left a comment

Choose a reason for hiding this comment

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

Hi @BenHenning mentioned all the comments PTAL thanks.

...edTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentTest.kt Outdated Show resolved Hide resolved
@rt4914 rt4914 self-assigned this May 17, 2022
@yash10019coder
Merge remote-tracking branch 'upstream/develop' into hi-fi-profile-ta…
7b9705e 
…blet-Implement_edit_profile_screen_inside_a_fragment
@oppiabot
Copy link

oppiabot bot commented May 24, 2022

Hi @yash10019coder, I'm going to mark this PR as stale because it hasn't had any updates for 7 days. If no further activity occurs within 7 days, it will be automatically closed so that others can take up the issue.
If you are still working on this PR, please make a follow-up commit within 3 days (and submit it for review, if applicable). Please also let us know if you are stuck so we can help you!

@oppiabot oppiabot bot added the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label May 24, 2022
@oppiabot oppiabot bot closed this May 31, 2022
@BenHenning
Copy link
Sponsor Member

Reopened since this was closed due to my late review.

@BenHenning BenHenning reopened this Jun 1, 2022
@oppiabot oppiabot bot removed the stale Corresponds to items that haven't seen a recent update and may be automatically closed. label Jun 1, 2022
BenHenning
BenHenning requested changes Jun 1, 2022
View reviewed changes
Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @yash10019coder. Sorry for the late review. Overall PR is LGTM, just had a few comments--PTAL.

app/BUILD.bazel Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt Outdated Show resolved Hide resolved
...n/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt Outdated Show resolved Hide resolved
rt4914
rt4914 approved these changes Jun 3, 2022
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 removed their assignment Jun 3, 2022
yash10019coder
yash10019coder commented Jun 5, 2022
View reviewed changes
Copy link
Contributor Author

@yash10019coder yash10019coder left a comment

Choose a reason for hiding this comment

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

Hi @BenHenning Made the requested changes PTAL thanks.

app/BUILD.bazel Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt Outdated Show resolved Hide resolved
...n/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentPresenter.kt Outdated Show resolved Hide resolved
BenHenning
BenHenning approved these changes Jun 7, 2022
View reviewed changes
Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @yash10019coder! This LGTM.

app/BUILD.bazel Outdated Show resolved Hide resolved
@BenHenning BenHenning merged commit 6608eef into oppia:develop Jun 7, 2022
@yash10019coder yash10019coder mentioned this pull request Jun 14, 2022
Open
4 tasks
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

@BenHenning BenHenning BenHenning approved these changes

@anandwana001 anandwana001 anandwana001 approved these changes

Assignees

@BenHenning BenHenning

Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@yash10019coder @BenHenning @rt4914 @anandwana001 @rishidyno