Merge pull request #16 from AndreasReitberger/15-switch-to-partial-properties

AndreasReitberger · web-flow · commit 786e7498f36b · 2025-01-28T07:14:25.000+01:00
Switched to `partial` properties
diff --git a/common.props b/common.props
@@ -13,7 +13,7 @@
         <Authors>Andreas Reitberger</Authors>
         <Copyright>Andreas Reitberger</Copyright>
 		<Company>Andreas Reitberger</Company>
-		<LangVersion>12</LangVersion>
+		<LangVersion>preview</LangVersion>
         <PublishReadyToRun>false</PublishReadyToRun>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
diff --git a/src/SharedXFormCoreLibrary/Interfaces/ILocalizationManager.cs b/src/SharedXFormCoreLibrary/Interfaces/ILocalizationManager.cs
@@ -1,14 +1,13 @@
 ﻿using AndreasReitberger.Shared.XForm.Core.Localization;
-using System.Globalization;
 
 namespace AndreasReitberger.Shared.XForm.Core.Interfaces
 {
     public interface ILocalizationManager
     {
         #region Properties
         public List<LocalizationInfo> Languages { get; set; }
-        public LocalizationInfo CurrentLanguage { get; set; }
-        public CultureInfo CurrentCulture { get; set; }
+        public LocalizationInfo? CurrentLanguage { get; set; }
+        public CultureInfo? CurrentCulture { get; set; }
         #endregion
 
         #region Methods
diff --git a/src/SharedXFormCoreLibrary/Models/ColorPickerElement.cs b/src/SharedXFormCoreLibrary/Models/ColorPickerElement.cs
@@ -1,10 +1,15 @@
-﻿namespace AndreasReitberger.Shared.XForm.Core.Models
+﻿using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace AndreasReitberger.Shared.XForm.Core.Models
 {
-    public class ColorPickerElement
+    public partial class ColorPickerElement : ObservableObject
     {
         #region Properties
-        public string Name { get; set; } = string.Empty;
-        public Color ChipColor { get; set; }
+        [ObservableProperty]
+        public partial string Name { get; set; } = string.Empty;
+
+        [ObservableProperty]
+        public partial Color? ChipColor { get; set; }
         #endregion
     }
 }
diff --git a/src/SharedXFormCoreLibrary/Models/Documentation/ChangeInfo.cs b/src/SharedXFormCoreLibrary/Models/Documentation/ChangeInfo.cs
@@ -1,13 +1,19 @@
 ﻿using AndreasReitberger.Shared.XForm.Core.Enums;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace AndreasReitberger.Shared.XForm.Core.Documentation
 {
-    public class ChangeInfo
+    public partial class ChangeInfo : ObservableObject
     {
         #region Properties
-        public ChangelogType Type { get; set; }
-        public string Changelog { get; set; } = string.Empty;
-        public string GlyphIcon { get; set; } = string.Empty;
+        [ObservableProperty]
+        public partial ChangelogType Type { get; set; }
+
+        [ObservableProperty]
+        public partial string Changelog { get; set; } = string.Empty;
+
+        [ObservableProperty]
+        public partial string GlyphIcon { get; set; } = string.Empty;
         #endregion
 
         #region Constructor
diff --git a/src/SharedXFormCoreLibrary/Models/Documentation/ChangelogInfo.cs b/src/SharedXFormCoreLibrary/Models/Documentation/ChangelogInfo.cs
@@ -1,14 +1,22 @@
 ﻿using AndreasReitberger.Shared.XForm.Core.Enums;
+using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace AndreasReitberger.Shared.XForm.Core.Documentation
 {
-    public class ChangelogInfo
+    public partial class ChangelogInfo : ObservableObject
     {
         #region Properties
-        public ChangelogType Type { get; set; }
-        public string Changelog { get; set; } = string.Empty;
-        public string Version { get; set; } = string.Empty;
-        public string GlyphIcon { get; set; } = string.Empty;
+        [ObservableProperty]
+        public partial ChangelogType Type { get; set; }
+
+        [ObservableProperty]
+        public partial string Changelog { get; set; } = string.Empty;
+
+        [ObservableProperty]
+        public partial string Version { get; set; } = string.Empty;
+
+        [ObservableProperty]
+        public partial string GlyphIcon { get; set; } = string.Empty;
         #endregion
 
         #region Constructor
diff --git a/src/SharedXFormCoreLibrary/Models/Documentation/LibraryInfo.cs b/src/SharedXFormCoreLibrary/Models/Documentation/LibraryInfo.cs
@@ -1,14 +1,22 @@
-﻿namespace AndreasReitberger.Shared.XForm.Core.Documentation
+﻿using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace AndreasReitberger.Shared.XForm.Core.Documentation
 {
-    public class LibraryInfo
+    public partial class LibraryInfo : ObservableObject
     {
         #region Properties
-        public string Library { get; set; }
-        public string LibraryUrl { get; set; }
-        public string Description { get; set; }
-        public bool StateChanged { get; set; }
-        public string License { get; set; }
-        public string LicenseUrl { get; set; }
+        [ObservableProperty]
+        public partial string Library { get; set; } = string.Empty;
+        [ObservableProperty]
+        public partial string LibraryUrl { get; set; } = string.Empty;
+        [ObservableProperty]
+        public partial string Description { get; set; } = string.Empty;
+        [ObservableProperty]
+        public partial bool StateChanged { get; set; }
+        [ObservableProperty]
+        public partial string License { get; set; } = string.Empty;
+        [ObservableProperty]
+        public partial string LicenseUrl { get; set; } = string.Empty;
         #endregion
 
         #region Constructor
diff --git a/src/SharedXFormCoreLibrary/Models/Documentation/ProVersionFeature.cs b/src/SharedXFormCoreLibrary/Models/Documentation/ProVersionFeature.cs
@@ -6,7 +6,7 @@ public  partial class ProVersionFeature : ObservableObject
     {
         #region Propertiers
         [ObservableProperty]
-        string feature = string.Empty;
+        public partial string Feature { get; set; } = string.Empty;
         #endregion
     }
 }
diff --git a/src/SharedXFormCoreLibrary/Models/Documentation/ResourceInfo.cs b/src/SharedXFormCoreLibrary/Models/Documentation/ResourceInfo.cs
@@ -1,11 +1,18 @@
-﻿namespace AndreasReitberger.Shared.XForm.Core.Documentation
+﻿using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace AndreasReitberger.Shared.XForm.Core.Documentation
 {
-    public class ResourceInfo
+    public partial class ResourceInfo : ObservableObject
     {
         #region Properties
-        public string Resource { get; set; }
-        public string ResourceUrl { get; set; }
-        public string Description { get; set; }
+        [ObservableProperty]
+        public partial string Resource { get; set; } = string.Empty;
+
+        [ObservableProperty]
+        public partial string ResourceUrl { get; set; } = string.Empty;
+
+        [ObservableProperty]
+        public partial string Description { get; set; } = string.Empty;
         #endregion
 
         #region Constructor
diff --git a/src/SharedXFormCoreLibrary/Models/Documentation/TutorialStep.cs b/src/SharedXFormCoreLibrary/Models/Documentation/TutorialStep.cs
@@ -1,25 +1,24 @@
 ﻿using CommunityToolkit.Mvvm.ComponentModel;
-using System;
 
 namespace AndreasReitberger.Shared.XForm.Core.Documentation
 {
     public partial class TutorialStep : ObservableObject
     {
         #region Properties
         [ObservableProperty]
-        Uri? image;
+        public partial Uri? Image { get; set; }
 
         [ObservableProperty]
-        string heading = string.Empty;
+        public partial string Heading { get; set; } = string.Empty;
 
         [ObservableProperty]
-        string content = string.Empty;
+        public partial string Content { get; set; } = string.Empty;
 
         [ObservableProperty]
-        int order = 0;
+        public partial int Order { get; set; } = 0;
 
         [ObservableProperty]
-        bool viewed = false;
+        public partial bool Viewed { get; set; } = false;
 
         #endregion
 
diff --git a/src/SharedXFormCoreLibrary/Models/Documentation/VersionInfo.cs b/src/SharedXFormCoreLibrary/Models/Documentation/VersionInfo.cs
@@ -1,12 +1,16 @@
-﻿using System.Collections.ObjectModel;
+﻿using CommunityToolkit.Mvvm.ComponentModel;
+using System.Collections.ObjectModel;
 
 namespace AndreasReitberger.Shared.XForm.Core.Documentation
 {
-    public class VersionInfo
+    public partial class VersionInfo : ObservableObject
     {
         #region Properties
-        public string Version { get; set; } = string.Empty;
-        public ObservableCollection<ChangeInfo> Changes { get; set; } = new();
+        [ObservableProperty]
+        public partial string Version { get; set; } = string.Empty;
+
+        [ObservableProperty]
+        public partial ObservableCollection<ChangeInfo> Changes { get; set; } = [];
         #endregion
 
         #region Constructor
diff --git a/src/SharedXFormCoreLibrary/Models/EventLogger/AppErrorEvent.cs b/src/SharedXFormCoreLibrary/Models/EventLogger/AppErrorEvent.cs
@@ -7,10 +7,10 @@ public partial class AppErrorEvent : AppEvent
     {
         #region Properties
         [ObservableProperty]
-        Exception? exception;
+        public partial Exception? Exception { get; set; }
 
         [ObservableProperty]
-        int type = 0;
+        public partial int Type { get; set; } = 0;
         #endregion
 
         #region Constructor
diff --git a/src/SharedXFormCoreLibrary/Models/EventLogger/AppEvent.cs b/src/SharedXFormCoreLibrary/Models/EventLogger/AppEvent.cs
@@ -7,16 +7,16 @@ public partial class AppEvent : ObservableObject
     {
         #region Properties
         [ObservableProperty]
-        string message = string.Empty;
+        public partial string Message { get; set; } = string.Empty;
 
         [ObservableProperty]
-        string sourceName = string.Empty;
+        public partial string SourceName { get; set; } = string.Empty;
 
         [ObservableProperty]
-        ErrorLevel level;
+        public partial ErrorLevel Level { get; set; }
 
         [ObservableProperty]
-        EventArgs? args;
+        public partial EventArgs? Args { get; set; }
         #endregion
     }
 }
diff --git a/src/SharedXFormCoreLibrary/Models/EventLogger/AppInfoEvent.cs b/src/SharedXFormCoreLibrary/Models/EventLogger/AppInfoEvent.cs
@@ -4,10 +4,6 @@ namespace AndreasReitberger.Shared.XForm.Core.EventLogger
 {
     public class AppInfoEvent : AppEvent
     {
-        #region Properties
-
-        #endregion
-
         #region Constructor
         public AppInfoEvent()
         {
diff --git a/src/SharedXFormCoreLibrary/Models/EventLogger/AppWarningEvent.cs b/src/SharedXFormCoreLibrary/Models/EventLogger/AppWarningEvent.cs
@@ -4,10 +4,6 @@ namespace AndreasReitberger.Shared.XForm.Core.EventLogger
 {
     public class AppWarningEvent : AppEvent
     {
-        #region Properties
-
-        #endregion
-
         #region Constructor
         public AppWarningEvent()
         {
diff --git a/src/SharedXFormCoreLibrary/Models/Localization/LocalizationInfo.cs b/src/SharedXFormCoreLibrary/Models/Localization/LocalizationInfo.cs
@@ -6,25 +6,25 @@ public partial class LocalizationInfo : ObservableObject
     {
         #region Properties
         [ObservableProperty]
-        string name = string.Empty;
+        public partial string Name { get; set; } = string.Empty;
 
         [ObservableProperty]
-        string nativeName = string.Empty;
+        public partial string NativeName { get; set; } = string.Empty;
 
         [ObservableProperty]
-        Uri? flagUri;
+        public partial Uri? FlagUri { get; set; }
 
         [ObservableProperty]
-        string translator = string.Empty;
+        public partial string Translator { get; set; } = string.Empty;
 
         [ObservableProperty]
-        string code = string.Empty;
+        public partial string Code { get; set; } = string.Empty;
 
         [ObservableProperty]
-        double percentTranslated = 0;
+        public partial double PercentTranslated { get; set; } = 0;
 
         [ObservableProperty]
-        bool isOfficial = false;
+        public partial bool IsOfficial { get; set; } = false;
         #endregion
 
         #region Constructors
diff --git a/src/SharedXFormCoreLibrary/Models/Localization/LocalizationManager.cs b/src/SharedXFormCoreLibrary/Models/Localization/LocalizationManager.cs
@@ -37,16 +37,16 @@ public static LocalizationManager Instance
 
         #region Properties
         [ObservableProperty]
-        string baseFlagImageUri = "";
+        public partial string BaseFlagImageUri { get; set; } = "";
 
         [ObservableProperty]
-        List<LocalizationInfo> languages = [];
+        public partial List<LocalizationInfo> Languages { get; set; } = [];
 
         [ObservableProperty]
-        LocalizationInfo? currentLanguage;
+        public partial LocalizationInfo? CurrentLanguage { get; set; }
 
         [ObservableProperty]
-        CultureInfo? currentCulture;
+        public partial CultureInfo? CurrentCulture { get; set; }
         #endregion
 
         #region Constructor
diff --git a/src/SharedXFormCoreLibrary/Models/ModelBase.cs b/src/SharedXFormCoreLibrary/Models/ModelBase.cs
@@ -6,10 +6,8 @@ namespace AndreasReitberger.Shared.XForm.Core.Models
     public partial class ModelBase : ObservableObject, IModelBase
     {
         #region ICloneable
-        public object Clone()
-        {
-            return MemberwiseClone();
-        }
+        public object Clone() => MemberwiseClone();
+        
         #endregion
 
         #region Dispose
diff --git a/src/SharedXFormCoreLibrary/Models/Theme/ColorInfo.cs b/src/SharedXFormCoreLibrary/Models/Theme/ColorInfo.cs
@@ -9,13 +9,13 @@ public partial class ColorInfo : ObservableObject
         /// A matching name for the color information.
         /// </summary>
         [ObservableProperty]
-        string name = string.Empty;
+        public partial string Name { get; set; } = string.Empty;
 
         /// <summary>
         /// The color for this info.
         /// </summary>
         [ObservableProperty]
-        Color color;
+        public partial Color Color { get; set; }
         partial void OnColorChanged(Color value)
         {
             if (string.IsNullOrEmpty(Name))
diff --git a/src/SharedXFormCoreLibrary/Models/Theme/DefaultThemeManager.cs b/src/SharedXFormCoreLibrary/Models/Theme/DefaultThemeManager.cs
@@ -32,7 +32,7 @@ public static DefaultThemeManager Instance
 
         #region Properties
         [ObservableProperty]
-        List<ThemeColorInfo> availableColors =
+        public partial List<ThemeColorInfo> AvailableColors { get; set; } =
         [
             new ThemeColorInfo() { ThemeName = "XForm", PrimaryColor = Color.FromHex("#2196F3"), IsAppDefault = true },
             new ThemeColorInfo() { ThemeName = Color.Gray.ToHex(), PrimaryColor = Color.Gray },
diff --git a/src/SharedXFormCoreLibrary/Models/Theme/ThemeColorInfo.cs b/src/SharedXFormCoreLibrary/Models/Theme/ThemeColorInfo.cs
diff --git a/src/SharedXFormCoreLibrary/Models/ViewModelBase.cs b/src/SharedXFormCoreLibrary/Models/ViewModelBase.cs
diff --git a/src/SharedXFormCoreLibrary/Utilities/UserSecretsManager.cs b/src/SharedXFormCoreLibrary/Utilities/UserSecretsManager.cs

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,15 @@`
`1`		`-namespace AndreasReitberger.Shared.XForm.Core.Models`
	`1`	`+using CommunityToolkit.Mvvm.ComponentModel;`
	`2`	`+`
	`3`	`+namespace AndreasReitberger.Shared.XForm.Core.Models`
`2`	`4`	`{`
`3`		`- public class ColorPickerElement`
	`5`	`+ public partial class ColorPickerElement : ObservableObject`
`4`	`6`	`{`
`5`	`7`	`#region Properties`
`6`		`- public string Name { get; set; } = string.Empty;`
`7`		`- public Color ChipColor { get; set; }`
	`8`	`+ [ObservableProperty]`
	`9`	`+ public partial string Name { get; set; } = string.Empty;`
	`10`	`+`
	`11`	`+ [ObservableProperty]`
	`12`	`+ public partial Color? ChipColor { get; set; }`
`8`	`13`	`#endregion`
`9`	`14`	`}`
`10`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public partial class ProVersionFeature : ObservableObject`
`6`	`6`	`{`
`7`	`7`	`#region Propertiers`
`8`	`8`	`[ObservableProperty]`
`9`		`- string feature = string.Empty;`
	`9`	`+ public partial string Feature { get; set; } = string.Empty;`
`10`	`10`	`#endregion`
`11`	`11`	`}`
`12`	`12`	`}`