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

Using JsonSerializer instead of JsonObject #1276

Merged
merged 9 commits into from
May 3, 2023
Merged

Using JsonSerializer instead of JsonObject #1276

merged 9 commits into from
May 3, 2023

Conversation

ghost1372
Copy link
Contributor

Using System.Text.Json.JsonSerializer instead of JsonObject for deserializing ControlInfoData.json file.
By using JsonSerializer, the codes become simpler and less, and we can use Async/Await
#1270

Description

  • Using JsonSerializer
  • Remove unnecessary items from ControlInfoData.json
  • Bring Back Icons to NavigationViewItem (Why has no one noticed it?)

1

Motivation and Context

How Has This Been Tested?

Tested On my Laptop

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

for deserializing async/await ControlInfoData.json
Since we use JsonSerializer, we don't need to define a default value
@marcelwgn marcelwgn self-assigned this Apr 20, 2023
WinUIGallery/DataModel/IconsDataSource.cs Show resolved Hide resolved
WinUIGallery/Navigation/NavigationRootPage.xaml.cs Outdated Show resolved Hide resolved
WinUIGallery/DataModel/ControlInfoDataSource.cs Outdated Show resolved Hide resolved
WinUIGallery/Common/FileLoader.cs Outdated Show resolved Hide resolved
WinUIGallery/DataModel/ControlInfoDataSource.cs Outdated Show resolved Hide resolved
WinUIGallery/DataModel/ControlInfoDataSource.cs Outdated Show resolved Hide resolved
Copy link
Collaborator

@karkarl karkarl left a comment

Choose a reason for hiding this comment

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

Will have to revert the changes for the sublevel NavView icons.

@ghost1372
Copy link
Contributor Author

Will have to revert the changes for the sublevel NavView icons.

done

Copy link
Collaborator

@karkarl karkarl left a comment

Choose a reason for hiding this comment

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

Looks great, thank you!

@karkarl karkarl merged commit b714f7a into microsoft:main May 3, 2023
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.

None yet

3 participants