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

[VDG] UI Decoupling #16 #10576

Merged
merged 209 commits into from Jun 5, 2023
Merged

[VDG] UI Decoupling #16 #10576

merged 209 commits into from Jun 5, 2023

Conversation

ichthus1604
Copy link
Collaborator

@ichthus1604 ichthus1604 commented Apr 27, 2023

  • Completes work initiated by @jmacato and introduced in [VDG] [DO NOT MERGE] UI Decoupling #14 #10459 and [VDG] [DO NOT MERGE] UI Decoupling #15 #10543
  • Removes NavBarItemViewModel from the inheritance hierarchy of DialogViewModelBase, and hence all ViewModels for dialogs in the entire software.
  • Introduces the INavBarToggle and INavBarButton interfaces, which enables the NavBar to interact with ViewModels that implement them, instead of relying on a common base type.
  • Introduces WalletPageViewModel which controls the different states and screens shown for each wallet in the wallet list: Login -> Loading -> WalletViewModel
  • Removes NavBar-related properties from RoutableViewModel and WalletViewModel.

soosr
soosr previously approved these changes Jun 2, 2023
Copy link
Collaborator

@soosr soosr left a comment

Choose a reason for hiding this comment

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

tACK

@soosr
Copy link
Collaborator

soosr commented Jun 2, 2023

@SuperJMN @ichthus1604 Merging Receive 3 caused conflict here, please take a look.

soosr
soosr previously approved these changes Jun 2, 2023
YohDeadfall
YohDeadfall previously approved these changes Jun 2, 2023
WalletWasabi.Fluent/Controls/NavBarItem.axaml.cs Outdated Show resolved Hide resolved
WalletWasabi.Fluent/Controls/NavBarItem.axaml.cs Outdated Show resolved Hide resolved
WalletWasabi.Fluent/Models/UI/NullWalletList.cs Outdated Show resolved Hide resolved
WalletWasabi.Fluent/Models/Wallets/WalletListModel.cs Outdated Show resolved Hide resolved
WalletWasabi.Fluent/ViewModels/MainViewModel.cs Outdated Show resolved Hide resolved
@YohDeadfall
Copy link
Collaborator

My comments above can be addressed in any follow up pull request, so this one won't be blocked from merging.

@ichthus1604 ichthus1604 dismissed stale reviews from YohDeadfall and soosr via dedf092 June 2, 2023 15:16
Copy link
Collaborator

@soosr soosr left a comment

Choose a reason for hiding this comment

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

tACK

@soosr soosr merged commit ef89bb9 into zkSNACKs:master Jun 5, 2023
5 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants