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.

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

fix: Display correct selected item in navigation drawer #1394

Closed
wants to merge 3 commits into from
Closed

fix: Display correct selected item in navigation drawer #1394

wants to merge 3 commits into from

Conversation

ShridharGoel
Copy link
Member

@ShridharGoel ShridharGoel commented Nov 9, 2018

Fixes #1383

Checklist:

  • I have checked for PMD and check-style issues
  • I have read the Contribution & Best practices Guide and my PR follows them.
  • My branch is up-to-date with the Upstream development branch.

Changes:
Now the selected tab will be in Check-In whenever user is in Check-In or it's child fragments.

Screenshots for the change:

ezgif com-video-to-gif 4

@iamareebjamal
Copy link
Member

This will fail other things, there was a reason this check was in place

@ShridharGoel
Copy link
Member Author

Did changes accordingly.

@ShridharGoel
Copy link
Member Author

The Travis CI build is still failing.

@Masquerade0097
Copy link
Member

Masquerade0097 commented Nov 10, 2018

@ShridharGoel The com.eventyay.organizer.core.main.FragmentNavigatorTest is failing.

@ShridharGoel
Copy link
Member Author

@Masquerade0097 Fixed.

Masquerade0097
Masquerade0097 previously approved these changes Nov 10, 2018
Copy link
Member

@Masquerade0097 Masquerade0097 left a comment

Choose a reason for hiding this comment

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

Looks fine to me.

@codecov
Copy link

codecov bot commented Nov 10, 2018

Codecov Report

Merging #1394 into development will not change coverage.
The diff coverage is 33.33%.

Impacted file tree graph

@@              Coverage Diff               @@
##             development    #1394   +/-   ##
==============================================
  Coverage          24.48%   24.48%           
  Complexity           757      757           
==============================================
  Files                237      237           
  Lines               8647     8647           
  Branches             351      351           
==============================================
  Hits                2117     2117           
  Misses              6447     6447           
  Partials              83       83
Impacted Files Coverage Δ Complexity Δ
...com/eventyay/organizer/core/main/MainActivity.java 0% <ø> (ø) 0 <0> (ø) ⬇️
...ventyay/organizer/core/main/FragmentNavigator.java 37.93% <33.33%> (-1.36%) 6 <0> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e951290...32d6f5d. Read the comment docs.

@@ -115,8 +115,6 @@ else if (eventId == -1)
finish();
else {
fragmentNavigator.back();
binding.navView.getMenu().findItem(R.id.nav_dashboard).setChecked(true);
Copy link
Member

Choose a reason for hiding this comment

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

What happens when back button is pressed from Attendees fragment. Does the Dashboard item get highlighted and title of toolbar changes to Dashboard?

Copy link
Member Author

Choose a reason for hiding this comment

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

Title of toolbar is changing to Dashboard but Dashboard item is not getting highlighted. I'll fix it.

@iamareebjamal
Copy link
Member

@ShridharGoel Please don't submit for review until everything is tested

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants