change namespace

softlion · softlion · commit 983a14f0c2e0 · 2025-08-26T10:30:57.000+02:00
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: windows-latest
     environment: Default
     env:
-      NUPKG_MAJOR: 5.0.1
+      NUPKG_MAJOR: 5.1.0
       DOTNET_CLI_TELEMETRY_OPTOUT: true
       DOTNET_NOLOGO: true
       PROJECT: Vapolia.UserInteraction\Vapolia.UserInteraction.csproj
diff --git a/MauiDemo/MauiProgram.cs b/MauiDemo/MauiProgram.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Console;
-using Vapolia.UserInteraction;
+using Vapolia.UserInteractions;
 
 namespace MauiDemo;
 
diff --git a/MauiDemo/ViewModels/Child1ViewModel.cs b/MauiDemo/ViewModels/Child1ViewModel.cs
@@ -1,5 +1,5 @@
 ﻿using System.Windows.Input;
-using Vapolia.UserInteraction;
+using Vapolia.UserInteractions;
 
 namespace MauiDemo;
 
diff --git a/MauiDemo/ViewModels/MainViewModel.cs b/MauiDemo/ViewModels/MainViewModel.cs
@@ -1,5 +1,5 @@
 ﻿using System.Windows.Input;
-using Vapolia.UserInteraction;
+using Vapolia.UserInteractions;
 
 namespace MauiDemo;
 
diff --git a/Vapolia.UserInteraction/Globals.cs b/Vapolia.UserInteraction/Globals.cs
@@ -0,0 +1 @@
+global using Vapolia.UserInteractions;
diff --git a/Vapolia.UserInteraction/IUserInteraction.cs b/Vapolia.UserInteraction/IUserInteraction.cs
@@ -1,4 +1,4 @@
-namespace Vapolia.UserInteraction;
+namespace Vapolia.UserInteractions;
 
 /// <summary>
 /// Interface for user interaction services providing dialogs, alerts, menus, and toast notifications.
diff --git a/Vapolia.UserInteraction/Models/ConfirmThreeButtonsResponse.cs b/Vapolia.UserInteraction/Models/ConfirmThreeButtonsResponse.cs
@@ -1,4 +1,4 @@
-namespace Vapolia.UserInteraction
+namespace Vapolia.UserInteractions
 {
 	public enum ConfirmThreeButtonsResponse
 	{
diff --git a/Vapolia.UserInteraction/Models/FieldType.cs b/Vapolia.UserInteraction/Models/FieldType.cs
@@ -1,4 +1,4 @@
-﻿namespace Vapolia.UserInteraction
+﻿namespace Vapolia.UserInteractions
 {
     /// <summary>
     /// Impact displayed keyboard
diff --git a/Vapolia.UserInteraction/Models/IWaitIndicator.cs b/Vapolia.UserInteraction/Models/IWaitIndicator.cs
@@ -1,4 +1,4 @@
-﻿namespace Vapolia.UserInteraction;
+﻿namespace Vapolia.UserInteractions;
 
 public interface IWaitIndicator
 {
diff --git a/Vapolia.UserInteraction/Models/InputResponse.cs b/Vapolia.UserInteraction/Models/InputResponse.cs
@@ -1,4 +1,4 @@
-namespace Vapolia.UserInteraction;
+namespace Vapolia.UserInteractions;
 
 public class InputResponse
 {
diff --git a/Vapolia.UserInteraction/Models/ToastDuration.cs b/Vapolia.UserInteraction/Models/ToastDuration.cs
@@ -1,4 +1,4 @@
-﻿namespace Vapolia.UserInteraction;
+﻿namespace Vapolia.UserInteractions;
 
 public enum ToastDuration
 {
diff --git a/Vapolia.UserInteraction/Models/ToastPosition.cs b/Vapolia.UserInteraction/Models/ToastPosition.cs
@@ -1,4 +1,4 @@
-﻿namespace Vapolia.UserInteraction
+﻿namespace Vapolia.UserInteractions
 {
     public enum ToastPosition
     {
diff --git a/Vapolia.UserInteraction/Models/ToastStyle.cs b/Vapolia.UserInteraction/Models/ToastStyle.cs
@@ -1,4 +1,4 @@
-﻿namespace Vapolia.UserInteraction;
+﻿namespace Vapolia.UserInteractions;
 
 public enum ToastStyle
 {
diff --git a/Vapolia.UserInteraction/UserInteraction.android.cs b/Vapolia.UserInteraction/UserInteraction.android.cs
@@ -20,7 +20,7 @@
 using ProgressBar = Android.Widget.ProgressBar;
 using Microsoft.Maui.Platform;
 
-namespace Vapolia.UserInteraction;
+namespace Vapolia.UserInteractions;
 
 
 public static class Constants
diff --git a/Vapolia.UserInteraction/UserInteraction.cs b/Vapolia.UserInteraction/UserInteraction.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 
-namespace Vapolia.UserInteraction;
+namespace Vapolia.UserInteractions;
 
 public partial class UserInteraction
 {
diff --git a/Vapolia.UserInteraction/UserInteraction.macios.cs b/Vapolia.UserInteraction/UserInteraction.macios.cs
@@ -5,7 +5,7 @@
 using Microsoft.Maui.Platform;
 using Vapolia.FluentLayouts;
 
-namespace Vapolia.UserInteraction;
+namespace Vapolia.UserInteractions;
 
 public partial class UserInteraction
 {
diff --git a/Vapolia.UserInteraction/UserInteraction.noplatform.cs b/Vapolia.UserInteraction/UserInteraction.noplatform.cs
@@ -1,4 +1,4 @@
-namespace Vapolia.UserInteraction;
+namespace Vapolia.UserInteractions;
 
 #if !IOS && !MACCATALYST && !ANDROID && !WINDOWS
 public partial class UserInteraction
diff --git a/Vapolia.UserInteraction/UserInteraction.windows.cs b/Vapolia.UserInteraction/UserInteraction.windows.cs
@@ -3,7 +3,7 @@
 using Microsoft.Maui.Platform;
 using Window = Microsoft.UI.Xaml.Window;
 
-namespace Vapolia.UserInteraction;
+namespace Vapolia.UserInteractions;
 
 public partial class UserInteraction
 {
diff --git a/Vapolia.UserInteraction/UserInteractionMauiAppBuilderExtensions.cs b/Vapolia.UserInteraction/UserInteractionMauiAppBuilderExtensions.cs
@@ -1,10 +1,10 @@
 ﻿using Microsoft.Extensions.Logging;
 
-[assembly: XmlnsDefinition("https://vapolia.eu/userinteraction", "Vapolia.UserInteraction")]
+[assembly: XmlnsDefinition("https://vapolia.eu/userinteraction", "Vapolia.UserInteractions")]
 [assembly: Microsoft.Maui.Controls.XmlnsPrefix("https://vapolia.eu/userinteraction", "ui")]
-[assembly: Microsoft.Maui.Controls.XmlnsPrefix("clr-namespace:Vapolia.UserInteraction;assembly=Vapolia.UserInteraction", "ui")]
+[assembly: Microsoft.Maui.Controls.XmlnsPrefix("clr-namespace:Vapolia.UserInteractions;assembly=Vapolia.UserInteractions", "ui")]
 
-namespace Vapolia.UserInteraction;
+namespace Vapolia.UserInteractions;
 
 public static class UserInteractionMauiAppBuilderExtensions
 {
diff --git a/Vapolia.UserInteraction/UserInteractionService.cs b/Vapolia.UserInteraction/UserInteractionService.cs
@@ -1,4 +1,4 @@
-namespace Vapolia.UserInteraction;
+namespace Vapolia.UserInteractions;
 
 /// <summary>
 /// Implementation of IUserInteraction that delegates to the static UserInteraction methods.
diff --git a/Vapolia.UserInteraction/Vapolia.UserInteraction.csproj b/Vapolia.UserInteraction/Vapolia.UserInteraction.csproj
@@ -78,6 +78,7 @@
         <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
         <PackageProjectUrl>https://github.com/softlion/UserInteraction</PackageProjectUrl>
         <PackageReleaseNotes>
+          5.1.0 breaking change: namespace is now Vapolia.UserInteractions to prevent conflicts between the namespace and the UserInteraction class  
           5.0.1 replace system.drawing.rectangle by maui.graphics.rectf
           5.0.0 removed xamarin
           4.0.0 unified version with old Xamarin

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Vapolia.UserInteraction;`
	`1`	`+namespace Vapolia.UserInteractions;`
`2`	`2`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Interface for user interaction services providing dialogs, alerts, menus, and toast notifications.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Vapolia.UserInteraction`
	`1`	`+namespace Vapolia.UserInteractions`
`2`	`2`	`{`
`3`	`3`	`public enum ConfirmThreeButtonsResponse`
`4`	`4`	`{`