File tree Expand file tree Collapse file tree 3 files changed +20
-2
lines changed
java/org/fossasia/openevent/general/auth Expand file tree Collapse file tree 3 files changed +20
-2
lines changed Original file line number Diff line number Diff line change @@ -196,7 +196,11 @@ class LoginFragment : Fragment() {
196196 SPEAKERS_CALL_FRAGMENT -> R .id.speakersCallFragment
197197 else -> R .id.eventsFragment
198198 }
199- findNavController(rootView).popBackStack(destinationId, false )
199+ if (destinationId == R .id.eventsFragment) {
200+ findNavController(rootView).navigate(LoginFragmentDirections .actionLoginToEventsPop())
201+ } else {
202+ findNavController(rootView).popBackStack(destinationId, false )
203+ }
200204 rootView.snackbar(R .string.welcome_back)
201205 }
202206}
Original file line number Diff line number Diff line change @@ -202,7 +202,11 @@ class SignUpFragment : Fragment() {
202202 SPEAKERS_CALL_FRAGMENT -> R .id.speakersCallFragment
203203 else -> R .id.eventsFragment
204204 }
205- findNavController(rootView).popBackStack(destinationId, false )
205+ if (destinationId == R .id.eventsFragment) {
206+ findNavController(rootView).navigate(SignUpFragmentDirections .actionSignUpToEventsPop())
207+ } else {
208+ findNavController(rootView).popBackStack(destinationId, false )
209+ }
206210 rootView.snackbar(R .string.logged_in_automatically)
207211 }
208212
Original file line number Diff line number Diff line change 756756 app : destination =" @id/authFragment"
757757 app : popUpTo =" @id/authFragment"
758758 app : popUpToInclusive =" true" />
759+ <action
760+ android : id =" @+id/action_login_to_events_pop"
761+ app : destination =" @id/eventsFragment"
762+ app : popUpTo =" @id/eventsFragment"
763+ app : popUpToInclusive =" true" />
759764 <argument
760765 android : name =" email"
761766 app : argType =" string"
776781 app : destination =" @id/authFragment"
777782 app : popUpTo =" @id/authFragment"
778783 app : popUpToInclusive =" true" />
784+ <action
785+ android : id =" @+id/action_sign_up_to_events_pop"
786+ app : destination =" @id/eventsFragment"
787+ app : popUpTo =" @id/eventsFragment"
788+ app : popUpToInclusive =" true" />
779789 <argument
780790 android : name =" email"
781791 app : argType =" string"
You can’t perform that action at this time.
0 commit comments