Merge pull request #150 from FmgLib/149-mauimarkupattribute-animate-extension-method-error

149 mauimarkupattribute animate extension method error

Author: gonultasmf

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Mustafa Gönültaş
+Copyright (c) 2024 FmgLib
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "FmgLib.MauiMarkup"), to deal

src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.AnimateTo.cs

@@ -13,12 +13,13 @@ void GenerateExtensionMethod_AnimateTo(PropInfo info, string transformationName)
     public static Task<bool> Animate{info.propertyName}To<T>(this T self, {info.propertyTypeName} value, uint length = 250, Easing? easing = null)
         where T : {info.MainSymbolName}");
 
+        var callBackSetValue = info.IsBindableProperty ? $"self.SetValue({info.BindablePropertyName}, actValue);" : $"self.{info.propertyName} = actValue;";
 
         builder.Append($@"
     {{
         {info.propertyTypeName} fromValue = self.{info.propertyName};
         var transform = (double t) => Transformations.{transformationName}(fromValue, value, t);
-        var callback = ({info.propertyTypeName} actValue) => {{ self.{info.propertyName} = actValue; }};
+        var callback = ({info.propertyTypeName} actValue) => {{ {callBackSetValue} }};
         return Transformations.AnimateAsync<{info.propertyTypeName}>(self, ""Animate{info.propertyName}To"", transform, callback, length, easing);
     }}
     ");

src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.cs

@@ -100,7 +100,7 @@ void GenerateClassExtensionBody()
             .ToList();
 
         var properties = propertiesMap
-            .Where(_ => (!_.IsReadOnly && !(_.SetMethod == null || _.SetMethod?.DeclaredAccessibility == Accessibility.Protected || _.SetMethod?.DeclaredAccessibility == Accessibility.Private)) || bindablePropertyNames.Any(e => e.Equals(_.Name)))
+            .Where(_ => (!_.IsReadOnly && !(_.SetMethod == null || _.SetMethod?.DeclaredAccessibility == Accessibility.Protected || _.SetMethod?.DeclaredAccessibility == Accessibility.Private || _.SetMethod?.DeclaredAccessibility == Accessibility.Internal)) || bindablePropertyNames.Any(e => e.Equals(_.Name)))
             .ToList();
 
         var readOnlyListProperties = propertiesMap

src/FmgLib.MauiMarkup/Extensions/ResourceDictionaryExtension.cs

@@ -44,7 +44,7 @@ public static T RemoveResource<T>(this T self, string key) where T : Microsoft.M
         return self;
     }
 
-    public static T MergedResources<T>(this T self, params ResourceDictionary[] resources) where T : Microsoft.Maui.Controls.ResourceDictionary
+    public static T MergedDictionaries<T>(this T self, params ResourceDictionary[] resources) where T : Microsoft.Maui.Controls.ResourceDictionary
     {
         foreach (var resource in resources)
         {
@@ -53,7 +53,7 @@ public static T MergedResources<T>(this T self, params ResourceDictionary[] reso
         return self;
     }
 
-    public static T MergedResources<T>(this T self, IList<ResourceDictionary> resources) where T : Microsoft.Maui.Controls.ResourceDictionary
+    public static T MergedDictionaries<T>(this T self, IList<ResourceDictionary> resources) where T : Microsoft.Maui.Controls.ResourceDictionary
     {
         foreach (var resource in resources)
         {

src/FmgLib.MauiMarkup/FmgLib.MauiMarkup.csproj

@@ -11,7 +11,7 @@
 		<PackageId>FmgLib.MauiMarkup</PackageId>
 		<Summary>FmgLib.MauiMarkup with C# Markup classes and fluent helper methods</Summary>
 		<Title>FmgLib.MauiMarkup</Title>
-		<Version>8.8.5</Version>
+		<Version>8.8.6</Version>
 		<Authors>FmgYazılım</Authors>
 		<Company>Fmg Yazılım</Company>
 		<Copyright>©2024</Copyright>

templates/FmgLib.MauiMarkup.TemplateApp/FmgLib.MauiMarkup.Template.csproj

@@ -4,7 +4,7 @@
 		<!-- The package metadata. Fill in the properties marked as TODO below -->
 		<!-- Follow the instructions on https://learn.microsoft.com/en-us/nuget/create-packages/package-authoring-best-practices -->
 		<PackageId>FmgLib.MauiMarkup.Template</PackageId>
-		<PackageVersion>3.3.2</PackageVersion>
+		<PackageVersion>3.3.2.1</PackageVersion>
 		<Title>FmgLib.MauiMarkup.Template</Title>
 		<Authors>FmgYazılım</Authors>
 		<Description>C# Markup (No XAML) templates for .NET MAUI application with Hotreload process.</Description>

templates/FmgLib.MauiMarkup.TemplateApp/content/FmgLib.MauiMarkup.App/App.cs

@@ -5,7 +5,7 @@ public partial class App : Application
     public App()
     {
         this
-        .Resources(new ResourceDictionary().MergedResources(AppStyles.Default))
+        .Resources(new ResourceDictionary().MergedDictionaries(AppStyles.Default))
         .MainPage(new AppShell());
     }
 }