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

Consolidate welcome module dependencies #299

Merged
merged 7 commits into from
Oct 25, 2018

Conversation

Cliabhach
Copy link
Contributor

This covers some of the groundwork implied by issue #298. It depends on #297, so please wait until that PR is merged before merging this.

Essentially, this PR creates a single module out of the contents of the

  • :events module
  • :exhibitions module
    and
  • :tours module.

It also switches the layout used in the three affected fragment classes to be the same file. Future commits can easily build upon a stable basis, but I'd like to receive confirmation that this is indeed the correct direction to bring the project. For that reason, I'd like to receive at least one indicator of approval from each of @caguilar187 , @agrosner , and @sam33rdhakal before merging this in.

@Cliabhach Cliabhach added the WIP Work in progress do not merge yet. label Oct 19, 2018
@@ -161,6 +169,22 @@ class AccessMemberCardFragment : BaseViewModelFragment<AccessMemberCardViewModel
.disposedBy(disposeBag)
}

override fun setupNavigationBindings(viewModel: AccessMemberCardViewModel) {
super.setupNavigationBindings(viewModel)
viewModel.navigateTo
Copy link

Choose a reason for hiding this comment

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

Identical blocks of code found in 4 locations. Consider refactoring.

when (it) {
is Navigate.Forward -> {
when (it.endpoint) {
viewModel.navigateTo
Copy link

Choose a reason for hiding this comment

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

Identical blocks of code found in 4 locations. Consider refactoring.

@Cliabhach Cliabhach force-pushed the pc-consolidate-welcome-module-dependencies branch from f7e9613 to ceaeee5 Compare October 19, 2018 23:01
@Cliabhach Cliabhach changed the title WIP: Consolidate welcome module dependencies Consolidate welcome module dependencies Oct 22, 2018
@Cliabhach Cliabhach force-pushed the pc-consolidate-welcome-module-dependencies branch from ceaeee5 to 1df832f Compare October 22, 2018 18:05
@Cliabhach Cliabhach removed the WIP Work in progress do not merge yet. label Oct 22, 2018
@Cliabhach Cliabhach force-pushed the pc-consolidate-welcome-module-dependencies branch from 1df832f to ac1701d Compare October 22, 2018 18:29
caguilar187
caguilar187 previously approved these changes Oct 22, 2018
@caguilar187 caguilar187 merged commit e68b240 into dev Oct 25, 2018
@Cliabhach Cliabhach deleted the pc-consolidate-welcome-module-dependencies branch October 26, 2018 18:36
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.

2 participants