Updating viewmodel creation code gen

nickrandolph · Oct 12, 2020 · ffe29fe · ffe29fe
1 parent 05a2bc9
commit ffe29fe
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/BuildIt.Navigation.Generator/PageViewModelGenerator.cs b/BuildIt.Navigation.Generator/PageViewModelGenerator.cs
@@ -174,7 +174,7 @@ public void OnVisitSyntaxNode(SyntaxNode syntaxNode)
 
                     if (syntaxNode is ClassDeclarationSyntax classDeclarationSyntax)
                     {
-                        var classAttribute = classDeclarationSyntax.AttributeLists.FirstOrDefault()?.Attributes.FirstOrDefault(attrib => (attrib.Name as IdentifierNameSyntax)?.Identifier.Text + "Attribute" == typeof(ApplicationAttribute).Name);
+                        var classAttribute = classDeclarationSyntax.AttributeLists.FirstOrDefault()?.Attributes.FirstOrDefault(attrib => (attrib.Name as IdentifierNameSyntax)?.Identifier.Text + "Attribute" == typeof(ViewModelMappingRegisterAttribute).Name);
                         var viewModelClassAttribute = classDeclarationSyntax.AttributeLists.FirstOrDefault()?.Attributes.FirstOrDefault(attrib => (attrib.Name as IdentifierNameSyntax)?.Identifier.Text + "Attribute" == typeof(ViewModelAttribute).Name);
                         if (classAttribute != null)
                         {

diff --git a/BuildIt.Navigation/EventMessageAttribute.cs b/BuildIt.Navigation/EventMessageAttribute.cs
@@ -43,11 +43,11 @@ public ApplicationServiceAttribute(string registrationMethod)
     }
 
     [AttributeUsage(AttributeTargets.Class)]
-    public class ApplicationAttribute : Attribute
+    public class ViewModelMappingRegisterAttribute : Attribute
     {
         public string RegistrationMappingMethod { get; }
 
-        public ApplicationAttribute(string registrationMethod)
+        public ViewModelMappingRegisterAttribute(string registrationMethod)
         {
             RegistrationMappingMethod = registrationMethod;
         }

diff --git a/MvvmNavigation.UI/UIMapping.cs b/MvvmNavigation.UI/UIMapping.cs
@@ -2,7 +2,7 @@
 
 namespace MvvmNavigation.UI
 {
-    [Application(nameof(RegistarViewModelMappings))]
+    [ViewModelMappingRegister(nameof(RegistarViewModelMappings))]
 
     public partial class UIMapping
     {

diff --git a/MvvmNavigation/MvvmNavigation.Shared/App.xaml.cs b/MvvmNavigation/MvvmNavigation.Shared/App.xaml.cs
@@ -1,10 +1,7 @@
 using BuildIt.Navigation;
-using BuildIt.Navigation.Messages;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using MvvmNavigation.Messages;
 using MvvmNavigation.UI;
-using MvvmNavigation.ViewModels;
 using System;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
@@ -14,7 +11,7 @@
 
 namespace MvvmNavigation
 {
-    [Application(nameof(RegistarViewModelMappings))]
+    [ViewModelMappingRegister(nameof(RegistarViewModelMappings))]
     sealed partial class App : Application, INavigationApplication
     {
         /// <summary>