Skip to content

View Integration for View Loadout Group Files #3171

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

Merged
merged 49 commits into from
May 19, 2025
Merged

Conversation

Sewer56
Copy link
Member

@Sewer56 Sewer56 commented May 9, 2025

Handles the PR feedback from

To be reviewed after above PR.
This contains the remaining view integration; however is not in a mergeable state due to external issues unrelated to the code.

EDIT (Al12rs):

Did a number of fixes and changes:

  • Fixed object disposed exception when deleting folders
  • Fixed additions/removals causing complete refresh
  • Fixed deleing a folder causing the entire UI tree to be cleared and left empty
  • Fixed page not loading contents on app startup
  • Fixed "View Mod Files" button being disabled for empty mods
  • Cleaned old unused views and view models
    • removed LoadoutItemGroupFileTreeViewModel after moving out utility function still in use to new VM
    • removed ItemContentsFileTree page/view/vm etc
  • Moved and renamed a number of files and classes to follow the structure used for other pages
    • Moved ViewLoadoutGroupFilesTreeDataGridAdapter into LoadoutGroupFilesViewModel
    • Moved LoadoutGroupFilesTreeFolderModelInitializer into LoadoutGroupFilesProvider
  • Various small comment and code cleanup

Remaining items:

Hoping @insomnious can have a look at these:
EDIT: will be done in separate PR

  • Fix indentation
  • Styling pass

Indents are broken when sorting

image

image

After sorting the indents remain on the same row as before, leading to regular files getting indented.

This will need a hand from @insomnious .

Sewer56 added 30 commits May 1, 2025 21:37
Seems I had the test borked, when I wrote the original code, oopsie!
Just need to fix some XAML, and off we go to Diff view
Fixed: Accidental errors in previous styles commit
… to the parent datom.

Changed: Filter by LoadoutFile directly, skipping a type check.
This reverts commit 4bb2581.
So we can use GamePath as key for folder generator
Copy link
Contributor

This PR doesn't conflict with main anymore. It can be merged after all status checks have passed and it has been reviewed.

@github-actions github-actions bot removed the status-needs-rebase Set by CI do not remove label May 12, 2025
@Al12rs Al12rs self-assigned this May 14, 2025
@Al12rs Al12rs marked this pull request as ready for review May 14, 2025 11:22
@Al12rs Al12rs moved this to Review in MVP May 14, 2025
@Al12rs Al12rs merged commit 512e526 into main May 19, 2025
25 of 28 checks passed
@github-project-automation github-project-automation bot moved this from Review to Done in MVP May 19, 2025
@Al12rs Al12rs deleted the view-for-viewloadoutgroups branch May 19, 2025 12:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants