[Nav Drawer] Move user profile and sign out link into popup #2397 #2434

NudurupatiSurya · 2024-04-10T02:55:24Z

Modified code to show a signout popup when the user clicks on the profile photo in the NavDrawer. [issue: https://github.com/[Nav Drawer] Move user profile and sign out link into popup #2397]
This time extracted user details using AuthenticationManager

Updated Demo:

Screen_recording_20240520_164103.mp4

* Initial Commit * Working - 1 * Small change * Updated Code based on the requirements * Removed Signout from NavDrawer * Modified code to retrieve user details using authentication manager

gino-m · 2024-04-10T13:52:41Z

Looks good! Please resolve conflicts and mark as "ready for review" once ready!

ground/src/debug/local/google-services.json

…droid

shobhitagarwal1612 · 2024-04-11T04:19:02Z

Thanks for working on this @NudurupatiSurya. Excited to get this merged too! 🎉 🎉 🎉

After comparing your screen recording with the mocks, I can see that there are a couple of more UI changes needed:

We need to show the app logo and name in the header and only show the profile photo at the right
Styling of this new dialog is not the same as the original signout confirmation dialog. So, could you please create a new compose dialog instead of reusing the existing one?
As per the mocks, the dialog appears to be anchored to the profile photo. Can you please check if that is feasible?

shobhitagarwal1612

Added comments above.

gino-m

Apologies for late feedback.. one small refactor, otherwise LG!

ground/src/main/java/com/google/android/ground/ui/home/SignOutConfirmationDialog.kt

ground/src/main/java/com/google/android/ground/ui/home/UserDetailsDialog.kt

gino-m · 2024-04-18T16:52:23Z

Running tests now, I'll paste in results so you can include in your next iteration.

/gcbrun

NudurupatiSurya · 2024-04-24T23:47:32Z

After comparing your screen recording with the mocks, I can see that there are a couple of more UI changes needed:

We need to show the app logo and name in the header and only show the profile photo at the right

Styling of this new dialog is not the same as the original signout confirmation dialog. So, could you please create a new compose dialog instead of reusing the existing one?

As per the mocks, the dialog appears to be anchored to the profile photo. Can you please check if that is feasible?

Hello @shobhitagarwal1612,

As you suggested, I have updated the navigation header to display the app logo and name, with the profile photo positioned on the right.

This is how it looks now:

However, I'm unsure about the style of the text for "Ground" and the spacing between the profile photo and the edge of the header. Could you please provide details if available?

I am also working on anchoring the user dialog to the navigation header and will convert the PR to ready for review once this is completed. Also, please let me know if you find anything that is missing.

Thank you,
Surya

CC: @gino-m

gino-m · 2024-04-26T16:28:23Z

Thanks you, @NudurupatiSurya!

However, I'm unsure about the style of the text for "Ground" and the spacing between the profile photo and the edge of the header. Could you please provide details if available?

@rawbzz, could you please advise?

NudurupatiSurya · 2024-05-09T12:37:41Z

Hello @gino-m,

Thank you for your feedback! I've updated the font size from pt to sp and changed marginEnd from px to dp as suggested.

Sorry for the delay in my response, I was tied up with finals week at my college.

I've moved the PR from draft to ready for review. Please have a look and let me know if further adjustments are needed.

Looking forward to potentially merging my first PR 😊

Best regards,
Surya

CC: @shobhitagarwal1612

shobhitagarwal1612 · 2024-05-09T12:42:38Z

Can you please update the screen recording in the PR description as well?

NudurupatiSurya · 2024-05-09T12:58:13Z

Can you please update the screen recording in the PR description as well?

Updated the description

shobhitagarwal1612 · 2024-05-13T04:17:38Z

/gcbrun

ground/src/main/java/com/google/android/ground/ui/home/HomeScreenFragment.kt

ground/src/main/java/com/google/android/ground/ui/home/HomeScreenViewModel.kt

shobhitagarwal1612 · 2024-05-13T04:33:44Z

Also pasting the output of GCB here:

* What went wrong:
Execution failed for task ':workspace:ground:ktfmtCheckMain'.
> [ktfmt] Found 3 files that are not properly formatted:
  src/main/java/com/google/android/ground/ui/home/SignOutConfirmationDialog.kt
  src/main/java/com/google/android/ground/ui/home/HomeScreenFragment.kt
  src/main/java/com/google/android/ground/ui/home/UserDetailsDialog.kt

You can fix this locally by running the gradle command ktfmtFormat

…droid

NudurupatiSurya · 2024-05-20T23:49:05Z

Hello @shobhitagarwal1612,

Thank you for the feedback. I have made the changes you suggested and updated the screen recording in the description. Please review and let me know if any further modifications are needed.

Regards,
Surya

CC: @gino-m

shobhitagarwal1612 · 2024-05-21T01:46:36Z

/gcbrun

shobhitagarwal1612 · 2024-05-22T14:50:17Z

The remote build is still failing. Can you please run checkCode locally and fix whatever is failing?

…droid

NudurupatiSurya · 2024-05-23T19:23:43Z

The remote build is still failing. Can you please run checkCode locally and fix whatever is failing?

I ran checkCode locally and found an unused resource file and some styles. I have removed these, and the build is now successful for checkCode. Do let me know if any further changes are needed. 😊

shobhitagarwal1612 · 2024-05-24T03:40:20Z

/gcbrun

shobhitagarwal1612 · 2024-05-25T06:13:55Z

@gino-m PTAL

gino-m · 2024-05-28T12:14:14Z

/gcbrun

gino-m

@NudurupatiSurya Nicely done! 🏅

NudurupatiSurya · 2024-05-28T15:22:17Z

@NudurupatiSurya Nicely done! 🏅

Thank You @gino-m!

Nudurupati surya 2 2397 (#1)

91a4b5e

* Initial Commit * Working - 1 * Small change * Updated Code based on the requirements * Removed Signout from NavDrawer * Modified code to retrieve user details using authentication manager

NudurupatiSurya changed the title ~~Nudurupati surya 2 2397 (#1)~~ [Nav Drawer] Move user profile and sign out link into popup #2397 Apr 10, 2024

NudurupatiSurya marked this pull request as draft April 10, 2024 02:57

NudurupatiSurya mentioned this pull request Apr 10, 2024

[Nav Drawer] Move user profile and sign out link into popup #2397

Closed

gino-m requested review from shobhitagarwal1612 and removed request for shobhitagarwal1612 April 10, 2024 13:52

shobhitagarwal1612 reviewed Apr 10, 2024

View reviewed changes

ground/src/debug/local/google-services.json Outdated Show resolved Hide resolved

NudurupatiSurya added 3 commits April 10, 2024 16:01

Merge branch 'master' into master

8ddb7b3

Reverted the deletion of google-services.json

a67dbde

Merge branch 'master' of https://github.com/NudurupatiSurya/ground-an…

2d931f2

…droid

NudurupatiSurya requested a review from shobhitagarwal1612 April 10, 2024 23:05

NudurupatiSurya marked this pull request as ready for review April 10, 2024 23:05

added few imports

53e7f07

shobhitagarwal1612 requested changes Apr 11, 2024

View reviewed changes

gino-m requested changes Apr 11, 2024

View reviewed changes

ground/src/main/java/com/google/android/ground/ui/home/SignOutConfirmationDialog.kt Outdated Show resolved Hide resolved

ground/src/main/java/com/google/android/ground/ui/home/SignOutConfirmationDialog.kt Show resolved Hide resolved

NudurupatiSurya added 4 commits April 13, 2024 20:16

Merge remote-tracking branch 'upstream/master'

6881b41

Modified code to adhere to SRP

4dfa529

added google-services.json

0de7b3e

some refactoring

bf8f60a

shobhitagarwal1612 requested changes Apr 14, 2024

View reviewed changes

NudurupatiSurya added 2 commits April 22, 2024 20:17

Merge branch 'master' into master

53115ec

Made suggested changes

4054059

NudurupatiSurya marked this pull request as draft April 23, 2024 04:28

NudurupatiSurya added 2 commits April 24, 2024 15:18

Rearranged the order of buttons in the dialog.

b6c01a0

Modified Nav Header

4fefe6c

Changed font to SP & marginEnd for user photo to DP

f1268cb

NudurupatiSurya marked this pull request as ready for review May 9, 2024 12:37

NudurupatiSurya requested review from gino-m and shobhitagarwal1612 May 9, 2024 12:38

Merge branch 'master' into master

52f10d7

Merge branch 'master' into master

7c484e9

shobhitagarwal1612 requested changes May 13, 2024

View reviewed changes

NudurupatiSurya added 3 commits May 20, 2024 16:33

Made requested changes

cc51e2c

Merge branch 'master' of https://github.com/NudurupatiSurya/ground-an…

64662bd

…droid

Merge branch 'master' into master

237690e

NudurupatiSurya requested a review from shobhitagarwal1612 May 20, 2024 23:49

NudurupatiSurya added 2 commits May 23, 2024 12:20

Fixed Lint Errors

fb9de96

Merge branch 'master' of https://github.com/NudurupatiSurya/ground-an…

6f75d7a

…droid

shobhitagarwal1612 approved these changes May 24, 2024

View reviewed changes

Merge branch 'master' into master

1ef7dea

gino-m approved these changes May 28, 2024

View reviewed changes

gino-m merged commit 2eef118 into google:master May 28, 2024
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Nav Drawer] Move user profile and sign out link into popup #2397 #2434

[Nav Drawer] Move user profile and sign out link into popup #2397 #2434

NudurupatiSurya commented Apr 10, 2024 •

edited by gino-m

gino-m commented Apr 10, 2024

shobhitagarwal1612 commented Apr 11, 2024

shobhitagarwal1612 left a comment

gino-m left a comment

gino-m commented Apr 18, 2024

NudurupatiSurya commented Apr 24, 2024 •

edited

gino-m commented Apr 26, 2024

NudurupatiSurya commented May 9, 2024

shobhitagarwal1612 commented May 9, 2024

NudurupatiSurya commented May 9, 2024

shobhitagarwal1612 commented May 13, 2024

shobhitagarwal1612 commented May 13, 2024

NudurupatiSurya commented May 20, 2024 •

edited

shobhitagarwal1612 commented May 21, 2024

shobhitagarwal1612 commented May 22, 2024

NudurupatiSurya commented May 23, 2024

shobhitagarwal1612 commented May 24, 2024

shobhitagarwal1612 commented May 25, 2024

gino-m commented May 28, 2024

gino-m left a comment

NudurupatiSurya commented May 28, 2024

[Nav Drawer] Move user profile and sign out link into popup #2397 #2434

[Nav Drawer] Move user profile and sign out link into popup #2397 #2434

Conversation

NudurupatiSurya commented Apr 10, 2024 • edited by gino-m

gino-m commented Apr 10, 2024

shobhitagarwal1612 commented Apr 11, 2024

shobhitagarwal1612 left a comment

Choose a reason for hiding this comment

gino-m left a comment

Choose a reason for hiding this comment

gino-m commented Apr 18, 2024

NudurupatiSurya commented Apr 24, 2024 • edited

gino-m commented Apr 26, 2024

NudurupatiSurya commented May 9, 2024

shobhitagarwal1612 commented May 9, 2024

NudurupatiSurya commented May 9, 2024

shobhitagarwal1612 commented May 13, 2024

shobhitagarwal1612 commented May 13, 2024

NudurupatiSurya commented May 20, 2024 • edited

shobhitagarwal1612 commented May 21, 2024

shobhitagarwal1612 commented May 22, 2024

NudurupatiSurya commented May 23, 2024

shobhitagarwal1612 commented May 24, 2024

shobhitagarwal1612 commented May 25, 2024

gino-m commented May 28, 2024

gino-m left a comment

Choose a reason for hiding this comment

NudurupatiSurya commented May 28, 2024

NudurupatiSurya commented Apr 10, 2024 •

edited by gino-m

NudurupatiSurya commented Apr 24, 2024 •

edited

NudurupatiSurya commented May 20, 2024 •

edited