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

Add support for Avalonia 0.11. #4

Merged
merged 3 commits into from
Aug 22, 2022

Conversation

laolarou726
Copy link
Contributor

@laolarou726 laolarou726 commented Aug 20, 2022

This change added support for Avalonia 0.11-beta-001.

Copy link
Member

@SKProCH SKProCH left a comment

Choose a reason for hiding this comment

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

Also, please remove temp files in v17 and FileContentIndex folders - they do not belong to the source code

@@ -7,7 +7,6 @@
</Application.DataTemplates>

<Application.Styles>
<FluentTheme Mode="Light"/>
Copy link
Member

Choose a reason for hiding this comment

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

Did you start demo app? I sure what nothing will be rendered without styles

Comment on lines +11 to +12
<TextBlock Grid.Column="2" Grid.Row="0" HorizontalAlignment="Center" Text="AdvancedImage"/>
<TextBlock Grid.Column="3" Grid.Row="0" HorizontalAlignment="Center" Text="Image"/>
Copy link
Member

Choose a reason for hiding this comment

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

I thing what moving controls content is an unnecessary change, not related to compatibility with avalonia 11

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In the latest Avalonia 0.11 version. They are not going to support putting text like

<TextBlock>xxx</TextBlock> # This will throw the error

As a result, we have to put all the texts in the Text property.

@@ -69,7 +69,7 @@ public class AdvancedImage : ContentControl {

var loaderChangedObservable = LoaderProperty.Changed
.Where(args => args.IsEffectiveValueChange)
.Where((args, i) => i == 0 || args.Sender.GetValue(ShouldLoaderChangeTriggerUpdateProperty))
.Where((args, i) => i == 0 || (bool)args.Sender.GetValue(ShouldLoaderChangeTriggerUpdateProperty))
Copy link
Member

Choose a reason for hiding this comment

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

This change will trigger possible null reference exception warning. We should suppress it via adding ! to the end of expression

@SKProCH SKProCH self-assigned this Aug 20, 2022
@SKProCH SKProCH added the enhancement New feature or request label Aug 20, 2022
@SKProCH
Copy link
Member

SKProCH commented Aug 20, 2022

I can implement it by myself tomorrow, if you want

@laolarou726
Copy link
Contributor Author

I just did a quick fix for those issues. Everything should be fine right now!

Copy link
Member

@SKProCH SKProCH left a comment

Choose a reason for hiding this comment

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

Looks fine, thanks

@SKProCH SKProCH changed the base branch from master to avalonia11 August 22, 2022 09:52
@SKProCH
Copy link
Member

SKProCH commented Aug 22, 2022

Temporarily, I will merge them in a separate branch, and post the Avalonia 11 package myself (in a short time)

@SKProCH SKProCH merged commit bef0889 into AvaloniaUtils:avalonia11 Aug 22, 2022
@SKProCH
Copy link
Member

SKProCH commented Aug 23, 2022

Hello, @laolarou726
I published this as v3.0.0-avalonia11 at nuget

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants