From 70bcc89e4ca3d234957068d8f0203f15f51b3197 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Wed, 27 Sep 2023 13:47:30 +0300 Subject: [PATCH 1/6] Update to .NET8 --- demo/UraniumApp/UraniumApp.csproj | 4 ++-- src/UraniumUI.Blurs/UraniumUI.Blurs.csproj | 4 ++-- .../UraniumUI.Dialogs.CommunityToolkit.csproj | 13 ++++--------- .../UraniumUI.Dialogs.Mopups.csproj | 12 +++--------- .../UraniumUI.Icons.FontAwesome.csproj | 4 ++-- .../UraniumUI.Icons.MaterialIcons.csproj | 6 +++--- .../UraniumUI.Icons.SegoeFluent.csproj | 6 +++--- src/UraniumUI.Material/UraniumUI.Material.csproj | 4 ++-- .../UraniumUI.Validations.DataAnnotations.csproj | 2 +- .../UraniumUI.WebComponents.csproj | 4 ++-- src/UraniumUI/UraniumUI.csproj | 13 ++++--------- 11 files changed, 28 insertions(+), 44 deletions(-) diff --git a/demo/UraniumApp/UraniumApp.csproj b/demo/UraniumApp/UraniumApp.csproj index c0992fd7..4f4f6d16 100644 --- a/demo/UraniumApp/UraniumApp.csproj +++ b/demo/UraniumApp/UraniumApp.csproj @@ -3,8 +3,8 @@ - net7.0-android;net7.0-ios;net7.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0 + net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 Exe diff --git a/src/UraniumUI.Blurs/UraniumUI.Blurs.csproj b/src/UraniumUI.Blurs/UraniumUI.Blurs.csproj index 747bdc86..171cdf13 100644 --- a/src/UraniumUI.Blurs/UraniumUI.Blurs.csproj +++ b/src/UraniumUI.Blurs/UraniumUI.Blurs.csproj @@ -4,8 +4,8 @@ - net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0 + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 true diff --git a/src/UraniumUI.Dialogs.CommunityToolkit/UraniumUI.Dialogs.CommunityToolkit.csproj b/src/UraniumUI.Dialogs.CommunityToolkit/UraniumUI.Dialogs.CommunityToolkit.csproj index 9fd01eb2..4941d607 100644 --- a/src/UraniumUI.Dialogs.CommunityToolkit/UraniumUI.Dialogs.CommunityToolkit.csproj +++ b/src/UraniumUI.Dialogs.CommunityToolkit/UraniumUI.Dialogs.CommunityToolkit.csproj @@ -4,8 +4,8 @@ - net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0 + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 true @@ -24,13 +24,8 @@ 6.5 - - - - - - - + + diff --git a/src/UraniumUI.Dialogs.Mopups/UraniumUI.Dialogs.Mopups.csproj b/src/UraniumUI.Dialogs.Mopups/UraniumUI.Dialogs.Mopups.csproj index 7bbef00a..058081a4 100644 --- a/src/UraniumUI.Dialogs.Mopups/UraniumUI.Dialogs.Mopups.csproj +++ b/src/UraniumUI.Dialogs.Mopups/UraniumUI.Dialogs.Mopups.csproj @@ -4,8 +4,8 @@ - net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0 + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 true @@ -24,13 +24,7 @@ 6.5 - - - - - - - + diff --git a/src/UraniumUI.Icons.FontAwesome/UraniumUI.Icons.FontAwesome.csproj b/src/UraniumUI.Icons.FontAwesome/UraniumUI.Icons.FontAwesome.csproj index dac27059..4e6bb1bc 100644 --- a/src/UraniumUI.Icons.FontAwesome/UraniumUI.Icons.FontAwesome.csproj +++ b/src/UraniumUI.Icons.FontAwesome/UraniumUI.Icons.FontAwesome.csproj @@ -4,8 +4,8 @@ - net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0 + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 true diff --git a/src/UraniumUI.Icons.MaterialIcons/UraniumUI.Icons.MaterialIcons.csproj b/src/UraniumUI.Icons.MaterialIcons/UraniumUI.Icons.MaterialIcons.csproj index a493ee62..424ba0c4 100644 --- a/src/UraniumUI.Icons.MaterialIcons/UraniumUI.Icons.MaterialIcons.csproj +++ b/src/UraniumUI.Icons.MaterialIcons/UraniumUI.Icons.MaterialIcons.csproj @@ -4,8 +4,8 @@ - net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0 + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 true @@ -24,7 +24,7 @@ 6.5 - + false diff --git a/src/UraniumUI.Icons.SegoeFluent/UraniumUI.Icons.SegoeFluent.csproj b/src/UraniumUI.Icons.SegoeFluent/UraniumUI.Icons.SegoeFluent.csproj index 572ca498..c5585190 100644 --- a/src/UraniumUI.Icons.SegoeFluent/UraniumUI.Icons.SegoeFluent.csproj +++ b/src/UraniumUI.Icons.SegoeFluent/UraniumUI.Icons.SegoeFluent.csproj @@ -5,8 +5,8 @@ - net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0 + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 true @@ -24,7 +24,7 @@ 6.5 - + false diff --git a/src/UraniumUI.Material/UraniumUI.Material.csproj b/src/UraniumUI.Material/UraniumUI.Material.csproj index 9a8b442a..aa3d680b 100644 --- a/src/UraniumUI.Material/UraniumUI.Material.csproj +++ b/src/UraniumUI.Material/UraniumUI.Material.csproj @@ -4,8 +4,8 @@ - net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0 + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 true diff --git a/src/UraniumUI.Validations.DataAnnotations/UraniumUI.Validations.DataAnnotations.csproj b/src/UraniumUI.Validations.DataAnnotations/UraniumUI.Validations.DataAnnotations.csproj index 79a500a2..6c5a6dfd 100644 --- a/src/UraniumUI.Validations.DataAnnotations/UraniumUI.Validations.DataAnnotations.csproj +++ b/src/UraniumUI.Validations.DataAnnotations/UraniumUI.Validations.DataAnnotations.csproj @@ -4,7 +4,7 @@ - net7.0;net6.0 + net8.0;net7.0;net6.0 diff --git a/src/UraniumUI.WebComponents/UraniumUI.WebComponents.csproj b/src/UraniumUI.WebComponents/UraniumUI.WebComponents.csproj index a86a2a4f..c17ec408 100644 --- a/src/UraniumUI.WebComponents/UraniumUI.WebComponents.csproj +++ b/src/UraniumUI.WebComponents/UraniumUI.WebComponents.csproj @@ -4,8 +4,8 @@ - net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0 + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 true diff --git a/src/UraniumUI/UraniumUI.csproj b/src/UraniumUI/UraniumUI.csproj index dc41ab15..71ed0dce 100644 --- a/src/UraniumUI/UraniumUI.csproj +++ b/src/UraniumUI/UraniumUI.csproj @@ -4,8 +4,8 @@ - net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst;net6.0;net6.0-android;net6.0-ios;net6.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0;net6.0-windows10.0.19041.0 + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 true @@ -23,13 +23,8 @@ 6.5 - - - - - - - + + From 059daea431b17a6026e7dfb905bdb1bba97dd759 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Thu, 28 Sep 2023 12:58:53 +0300 Subject: [PATCH 2/6] Adapt to .NET8 --- global.json | 5 -- maui.common.props | 4 +- src/UraniumUI.Blurs/UraniumUI.Blurs.csproj | 5 +- .../UraniumUI.Dialogs.CommunityToolkit.csproj | 31 ++++----- .../UraniumUI.Dialogs.Mopups.csproj | 27 ++++---- .../UraniumUI.Icons.FontAwesome.csproj | 41 ++++++------ .../UraniumUI.Icons.MaterialIcons.csproj | 47 ++++++------- .../UraniumUI.Icons.SegoeFluent.csproj | 1 + .../Handlers/ButtonViewHandler.Android.cs | 4 -- .../Handlers/ButtonViewHandler.Apple.cs | 5 +- .../Handlers/ButtonViewHandler.Windows.cs | 4 -- .../Handlers/ButtonViewHandler.cs | 2 +- .../Resources/ColorResource.xaml.cs | 1 - .../UraniumUI.Material.csproj | 67 ++++++++++--------- ...aniumUI.Validations.DataAnnotations.csproj | 7 +- .../UraniumUI.WebComponents.csproj | 3 +- .../Handlers/AutoCompleteViewHandler.Apple.cs | 4 -- .../Handlers/AutoCompleteViewHandler.cs | 2 +- .../Handlers/StatefulContentViewHandler.cs | 12 ---- src/UraniumUI/UraniumUI.csproj | 57 ++++++++-------- .../UraniumUI.Material.Tests.csproj | 2 +- .../UraniumUI.Tests.Core.csproj | 2 +- test/UraniumUI.Tests/UraniumUI.Tests.csproj | 2 +- 23 files changed, 158 insertions(+), 177 deletions(-) delete mode 100644 global.json diff --git a/global.json b/global.json deleted file mode 100644 index 401762bf..00000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "7.0.302" - } -} diff --git a/maui.common.props b/maui.common.props index 3fa2322d..dc173551 100644 --- a/maui.common.props +++ b/maui.common.props @@ -1,8 +1,8 @@ - + \ No newline at end of file diff --git a/src/UraniumUI.Blurs/UraniumUI.Blurs.csproj b/src/UraniumUI.Blurs/UraniumUI.Blurs.csproj index 171cdf13..a2b428a7 100644 --- a/src/UraniumUI.Blurs/UraniumUI.Blurs.csproj +++ b/src/UraniumUI.Blurs/UraniumUI.Blurs.csproj @@ -4,13 +4,14 @@ - net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 true true enable + true 14.2 14.0 diff --git a/src/UraniumUI.Dialogs.CommunityToolkit/UraniumUI.Dialogs.CommunityToolkit.csproj b/src/UraniumUI.Dialogs.CommunityToolkit/UraniumUI.Dialogs.CommunityToolkit.csproj index 4941d607..5b37374d 100644 --- a/src/UraniumUI.Dialogs.CommunityToolkit/UraniumUI.Dialogs.CommunityToolkit.csproj +++ b/src/UraniumUI.Dialogs.CommunityToolkit/UraniumUI.Dialogs.CommunityToolkit.csproj @@ -2,27 +2,28 @@ - - - net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 - - - true - true - enable + + + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 + + + true + true + enable + true false Library UraniumUI.Dialogs.CommunityToolkit true 14.2 - 14.0 - 21.0 - 10.0.17763.0 - 10.0.17763.0 - 6.5 - + 14.0 + 21.0 + 10.0.17763.0 + 10.0.17763.0 + 6.5 + diff --git a/src/UraniumUI.Dialogs.Mopups/UraniumUI.Dialogs.Mopups.csproj b/src/UraniumUI.Dialogs.Mopups/UraniumUI.Dialogs.Mopups.csproj index 058081a4..ba18c527 100644 --- a/src/UraniumUI.Dialogs.Mopups/UraniumUI.Dialogs.Mopups.csproj +++ b/src/UraniumUI.Dialogs.Mopups/UraniumUI.Dialogs.Mopups.csproj @@ -4,25 +4,26 @@ - net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 - - true - true - enable + + true + true + enable + true false Library UraniumUI.Dialogs.Mopups true - 14.2 - 14.0 - 21.0 - 10.0.17763.0 - 10.0.17763.0 - 6.5 - + 14.2 + 14.0 + 21.0 + 10.0.17763.0 + 10.0.17763.0 + 6.5 + diff --git a/src/UraniumUI.Icons.FontAwesome/UraniumUI.Icons.FontAwesome.csproj b/src/UraniumUI.Icons.FontAwesome/UraniumUI.Icons.FontAwesome.csproj index 4e6bb1bc..dca814d0 100644 --- a/src/UraniumUI.Icons.FontAwesome/UraniumUI.Icons.FontAwesome.csproj +++ b/src/UraniumUI.Icons.FontAwesome/UraniumUI.Icons.FontAwesome.csproj @@ -2,27 +2,28 @@ - - - net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 - - - true - true - enable - false - true - Library - true - 14.2 - 14.0 - 21.0 - 10.0.17763.0 - 10.0.17763.0 - 6.5 - + + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 + + + true + true + enable + true + false + true + Library + + true + 14.2 + 14.0 + 21.0 + 10.0.17763.0 + 10.0.17763.0 + 6.5 + diff --git a/src/UraniumUI.Icons.MaterialIcons/UraniumUI.Icons.MaterialIcons.csproj b/src/UraniumUI.Icons.MaterialIcons/UraniumUI.Icons.MaterialIcons.csproj index 424ba0c4..bfaaee52 100644 --- a/src/UraniumUI.Icons.MaterialIcons/UraniumUI.Icons.MaterialIcons.csproj +++ b/src/UraniumUI.Icons.MaterialIcons/UraniumUI.Icons.MaterialIcons.csproj @@ -2,31 +2,32 @@ - - - net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 - - - true - true - enable - false - true - Library - true - 14.2 - 14.0 - 21.0 - 10.0.17763.0 - 10.0.17763.0 - 6.5 - + + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 + + + true + true + enable + true + false + true + Library - - false - + true + 14.2 + 14.0 + 21.0 + 10.0.17763.0 + 10.0.17763.0 + 6.5 + + + + false + diff --git a/src/UraniumUI.Icons.SegoeFluent/UraniumUI.Icons.SegoeFluent.csproj b/src/UraniumUI.Icons.SegoeFluent/UraniumUI.Icons.SegoeFluent.csproj index c5585190..589515c0 100644 --- a/src/UraniumUI.Icons.SegoeFluent/UraniumUI.Icons.SegoeFluent.csproj +++ b/src/UraniumUI.Icons.SegoeFluent/UraniumUI.Icons.SegoeFluent.csproj @@ -12,6 +12,7 @@ true true enable + true false true Library diff --git a/src/UraniumUI.Material/Handlers/ButtonViewHandler.Android.cs b/src/UraniumUI.Material/Handlers/ButtonViewHandler.Android.cs index 74c9f57a..96cfcf72 100644 --- a/src/UraniumUI.Material/Handlers/ButtonViewHandler.Android.cs +++ b/src/UraniumUI.Material/Handlers/ButtonViewHandler.Android.cs @@ -25,11 +25,7 @@ private void NativeView_Hover(object sender, Android.Views.View.HoverEventArgs e { if (e.Event.Action == MotionEventActions.HoverEnter) { -#if NET6_0 - VisualStateManager.GoToState(StatefulView, "PointerOver"); -#else VisualStateManager.GoToState(StatefulView, VisualStateManager.CommonStates.PointerOver); -#endif ExecuteCommandIfCan(StatefulView.HoverCommand); StatefulView.InvokeHovered(); return; diff --git a/src/UraniumUI.Material/Handlers/ButtonViewHandler.Apple.cs b/src/UraniumUI.Material/Handlers/ButtonViewHandler.Apple.cs index 325764d6..5367b73c 100644 --- a/src/UraniumUI.Material/Handlers/ButtonViewHandler.Apple.cs +++ b/src/UraniumUI.Material/Handlers/ButtonViewHandler.Apple.cs @@ -25,11 +25,8 @@ private void OnHover(UIHoverGestureRecognizer recognizer) switch (recognizer.State) { case UIGestureRecognizerState.Began: -#if NET6_0 - VisualStateManager.GoToState(StatefulView, "PointerOver"); -#else + VisualStateManager.GoToState(StatefulView, VisualStateManager.CommonStates.PointerOver); -#endif ExecuteCommandIfCan(StatefulView.HoverCommand); StatefulView.InvokeHovered(); break; diff --git a/src/UraniumUI.Material/Handlers/ButtonViewHandler.Windows.cs b/src/UraniumUI.Material/Handlers/ButtonViewHandler.Windows.cs index df0321bf..b046aef8 100644 --- a/src/UraniumUI.Material/Handlers/ButtonViewHandler.Windows.cs +++ b/src/UraniumUI.Material/Handlers/ButtonViewHandler.Windows.cs @@ -59,11 +59,7 @@ private void PlatformView_PointerExited(object sender, PointerRoutedEventArgs e) private void PlatformView_PointerEntered(object sender, PointerRoutedEventArgs e) { -#if NET6_0 - VisualStateManager.GoToState(StatefulView, "PointerOver"); -#else VisualStateManager.GoToState(StatefulView, VisualStateManager.CommonStates.PointerOver); -#endif ExecuteCommandIfCan(StatefulView.HoverCommand); StatefulView.InvokeHovered(); } diff --git a/src/UraniumUI.Material/Handlers/ButtonViewHandler.cs b/src/UraniumUI.Material/Handlers/ButtonViewHandler.cs index e139c344..f974b8b4 100644 --- a/src/UraniumUI.Material/Handlers/ButtonViewHandler.cs +++ b/src/UraniumUI.Material/Handlers/ButtonViewHandler.cs @@ -1,4 +1,4 @@ -#if NET7_0 || NET6_0 +#if NET8_0 using Microsoft.Maui.Handlers; using System.Windows.Input; diff --git a/src/UraniumUI.Material/Resources/ColorResource.xaml.cs b/src/UraniumUI.Material/Resources/ColorResource.xaml.cs index 98c87141..72d13125 100644 --- a/src/UraniumUI.Material/Resources/ColorResource.xaml.cs +++ b/src/UraniumUI.Material/Resources/ColorResource.xaml.cs @@ -2,7 +2,6 @@ public partial class ColorResource : ResourceDictionary { - private ResourceDictionary basedOn; private ResourceDictionary overriddenBy; public ColorResource() diff --git a/src/UraniumUI.Material/UraniumUI.Material.csproj b/src/UraniumUI.Material/UraniumUI.Material.csproj index aa3d680b..dc1df708 100644 --- a/src/UraniumUI.Material/UraniumUI.Material.csproj +++ b/src/UraniumUI.Material/UraniumUI.Material.csproj @@ -4,42 +4,43 @@ - net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 - - - true - true - false - enable - Library + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 + + + true + true + false + enable + true + Library true - 14.2 - 14.0 - 21.0 - 10.0.17763.0 - 10.0.17763.0 - 6.5 - + 14.2 + 14.0 + 21.0 + 10.0.17763.0 + 10.0.17763.0 + 6.5 + - - - + + + - - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - - + + + MSBuild:Compile + + + MSBuild:Compile + + + MSBuild:Compile + + + MSBuild:Compile + + diff --git a/src/UraniumUI.Validations.DataAnnotations/UraniumUI.Validations.DataAnnotations.csproj b/src/UraniumUI.Validations.DataAnnotations/UraniumUI.Validations.DataAnnotations.csproj index 6c5a6dfd..b74b72fa 100644 --- a/src/UraniumUI.Validations.DataAnnotations/UraniumUI.Validations.DataAnnotations.csproj +++ b/src/UraniumUI.Validations.DataAnnotations/UraniumUI.Validations.DataAnnotations.csproj @@ -4,13 +4,14 @@ - net8.0;net7.0;net6.0 + net8.0 true true enable + true UraniumUI Library @@ -25,4 +26,8 @@ + + + + diff --git a/src/UraniumUI.WebComponents/UraniumUI.WebComponents.csproj b/src/UraniumUI.WebComponents/UraniumUI.WebComponents.csproj index c17ec408..39a2fb97 100644 --- a/src/UraniumUI.WebComponents/UraniumUI.WebComponents.csproj +++ b/src/UraniumUI.WebComponents/UraniumUI.WebComponents.csproj @@ -11,8 +11,9 @@ true true enable + true - 14.2 + 14.2 14.0 21.0 10.0.17763.0 diff --git a/src/UraniumUI/Handlers/AutoCompleteViewHandler.Apple.cs b/src/UraniumUI/Handlers/AutoCompleteViewHandler.Apple.cs index d992eaea..7745e1f2 100644 --- a/src/UraniumUI/Handlers/AutoCompleteViewHandler.Apple.cs +++ b/src/UraniumUI/Handlers/AutoCompleteViewHandler.Apple.cs @@ -157,11 +157,7 @@ public AutoCompleteViewSource AutoCompleteViewSource public int AutocompleteTableViewHeight { get; set; } = 150; -#if NET6_0 public void Draw(UIViewController viewController, CALayer layer, AutoCompleteView virtualView, NFloat x, NFloat y) -#else - public void Draw(UIViewController viewController, CALayer layer, AutoCompleteView virtualView, NFloat x, NFloat y) -#endif { var _scrollView = GetParentScrollView(this); _drawnFrame = layer.Frame; diff --git a/src/UraniumUI/Handlers/AutoCompleteViewHandler.cs b/src/UraniumUI/Handlers/AutoCompleteViewHandler.cs index b0dae21f..481dc9fe 100644 --- a/src/UraniumUI/Handlers/AutoCompleteViewHandler.cs +++ b/src/UraniumUI/Handlers/AutoCompleteViewHandler.cs @@ -23,7 +23,7 @@ public AutoCompleteViewHandler() : base(IconViewMapper) } } -#if (NET7_0 || NET6_0 ) && !ANDROID && !IOS && !MACCATALYST && !WINDOWS +#if (NET8_0) && !ANDROID && !IOS && !MACCATALYST && !WINDOWS public partial class AutoCompleteViewHandler : ViewHandler { public AutoCompleteViewHandler(IPropertyMapper mapper, CommandMapper commandMapper = null) : base(IconViewMapper, commandMapper) diff --git a/src/UraniumUI/Handlers/StatefulContentViewHandler.cs b/src/UraniumUI/Handlers/StatefulContentViewHandler.cs index 736a8b44..90e50ee9 100644 --- a/src/UraniumUI/Handlers/StatefulContentViewHandler.cs +++ b/src/UraniumUI/Handlers/StatefulContentViewHandler.cs @@ -54,11 +54,7 @@ private void NativeView_Hover(object sender, Android.Views.View.HoverEventArgs e { if (e.Event.Action == MotionEventActions.HoverEnter) { -#if NET6_0 - GoToState(StatefulView, "PointerOver"); -#else GoToState(StatefulView, CommonStates.PointerOver); -#endif ExecuteCommandIfCan(StatefulView.HoverCommand); StatefulView.InvokeHovered(); return; @@ -144,11 +140,7 @@ private void PlatformView_PointerExited(object sender, PointerRoutedEventArgs e) private void PlatformView_PointerEntered(object sender, PointerRoutedEventArgs e) { -#if NET6_0 - GoToState(StatefulView, "PointerOver"); -#else GoToState(StatefulView, CommonStates.PointerOver); -#endif ExecuteCommandIfCan(StatefulView.HoverCommand); StatefulView.InvokeHovered(); } @@ -224,11 +216,7 @@ private void OnHover(UIHoverGestureRecognizer recognizer) { case UIGestureRecognizerState.Began: -#if NET6_0 - GoToState(StatefulView, "PointerOver"); -#else GoToState(StatefulView, CommonStates.PointerOver); -#endif ExecuteCommandIfCan(StatefulView.HoverCommand); StatefulView.InvokeHovered(); break; diff --git a/src/UraniumUI/UraniumUI.csproj b/src/UraniumUI/UraniumUI.csproj index 71ed0dce..e21a9f85 100644 --- a/src/UraniumUI/UraniumUI.csproj +++ b/src/UraniumUI/UraniumUI.csproj @@ -1,19 +1,19 @@  - - + + + + + net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 + + + true + true + enable + false + Library - - net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 - - - true - true - enable - false - Library - true 14.2 14.0 @@ -23,20 +23,21 @@ 6.5 - - - - - - - - StyleResource.xaml - - + + + + + + + + + StyleResource.xaml + + - - - MSBuild:Compile - - + + + MSBuild:Compile + + diff --git a/test/UraniumUI.Material.Tests/UraniumUI.Material.Tests.csproj b/test/UraniumUI.Material.Tests/UraniumUI.Material.Tests.csproj index c1b35cde..b217abdf 100644 --- a/test/UraniumUI.Material.Tests/UraniumUI.Material.Tests.csproj +++ b/test/UraniumUI.Material.Tests/UraniumUI.Material.Tests.csproj @@ -2,7 +2,7 @@ - net7.0 + net8.0 enable true true diff --git a/test/UraniumUI.Tests.Core/UraniumUI.Tests.Core.csproj b/test/UraniumUI.Tests.Core/UraniumUI.Tests.Core.csproj index 97f9b1af..7549bd1d 100644 --- a/test/UraniumUI.Tests.Core/UraniumUI.Tests.Core.csproj +++ b/test/UraniumUI.Tests.Core/UraniumUI.Tests.Core.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 enable true true diff --git a/test/UraniumUI.Tests/UraniumUI.Tests.csproj b/test/UraniumUI.Tests/UraniumUI.Tests.csproj index e41dbfb4..1d88763e 100644 --- a/test/UraniumUI.Tests/UraniumUI.Tests.csproj +++ b/test/UraniumUI.Tests/UraniumUI.Tests.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 enable true true From bc8812afbe09519cbc862e51431fd47e493546d3 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Thu, 28 Sep 2023 13:13:52 +0300 Subject: [PATCH 3/6] Fix casting problems --- demo/UraniumApp/ViewShowcaseView.cs | 2 +- src/UraniumUI.Material/Controls/Chip.cs | 7 ++++--- src/UraniumUI/Controls/ExpanderView.cs | 11 ++++++----- src/UraniumUI/Extensions/ColorExtensions.cs | 5 +++++ 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/demo/UraniumApp/ViewShowcaseView.cs b/demo/UraniumApp/ViewShowcaseView.cs index 5923cac1..7fde7d0d 100644 --- a/demo/UraniumApp/ViewShowcaseView.cs +++ b/demo/UraniumApp/ViewShowcaseView.cs @@ -17,7 +17,7 @@ public ViewShowcaseView() ColorResource.GetColor("Surface", Colors.Gray), ColorResource.GetColor("SurfaceDark", Colors.DarkGray)); - sidePanelContentView.SetAppThemeColor(ContentView.BackgroundProperty, Color.FromArgb("#25ffffff"), Color.FromArgb("#25000000")); + sidePanelContentView.SetAppThemeColor(ContentView.BackgroundColorProperty, Color.FromArgb("#25ffffff"), Color.FromArgb("#25000000")); StrokeShape = new RoundRectangle { diff --git a/src/UraniumUI.Material/Controls/Chip.cs b/src/UraniumUI.Material/Controls/Chip.cs index 411d61b1..560a5e1f 100644 --- a/src/UraniumUI.Material/Controls/Chip.cs +++ b/src/UraniumUI.Material/Controls/Chip.cs @@ -1,5 +1,6 @@ using Microsoft.Maui.Controls.Shapes; using System.Windows.Input; +using UraniumUI.Extensions; using UraniumUI.Pages; using UraniumUI.Resources; using UraniumUI.Views; @@ -37,10 +38,10 @@ public Chip() ColorResource.GetColor("Primary", defaultAccent), ColorResource.GetColor("PrimaryDark", defaultAccent)); - (closeButton.Content as Path).SetAppThemeColor( + (closeButton.Content as Path).SetAppTheme( Path.FillProperty, - Colors.White.WithAlpha(.5f), - Colors.Black.WithAlpha(.5f) + Colors.White.WithAlpha(.5f).ToSolidColorBrush(), + Colors.Black.WithAlpha(.5f).ToSolidColorBrush() ); label.SetAppThemeColor( diff --git a/src/UraniumUI/Controls/ExpanderView.cs b/src/UraniumUI/Controls/ExpanderView.cs index f64900e2..9d4d90fa 100644 --- a/src/UraniumUI/Controls/ExpanderView.cs +++ b/src/UraniumUI/Controls/ExpanderView.cs @@ -1,4 +1,5 @@ -using UraniumUI.Pages; +using UraniumUI.Extensions; +using UraniumUI.Pages; using UraniumUI.Resources; using UraniumUI.Views; using Path = Microsoft.Maui.Controls.Shapes.Path; @@ -42,10 +43,10 @@ public ExpanderView() Padding = new Thickness(10, 0), Content = arrowIcon }, column: 1) ; - - arrowIcon.SetAppThemeColor(Path.FillProperty, - ColorResource.GetColor("OnBackground", Colors.Gray), - ColorResource.GetColor("OnBackgroundDark", Colors.Gray)); + + arrowIcon.SetAppTheme(Path.FillProperty, + ColorResource.GetColor("OnBackground", Colors.Gray).ToSolidColorBrush(), + ColorResource.GetColor("OnBackgroundDark", Colors.Gray).ToSolidColorBrush()); actualContentContainer.IsVisible = false; Content = new VerticalStackLayout diff --git a/src/UraniumUI/Extensions/ColorExtensions.cs b/src/UraniumUI/Extensions/ColorExtensions.cs index 4fc13d28..1a83dc83 100644 --- a/src/UraniumUI/Extensions/ColorExtensions.cs +++ b/src/UraniumUI/Extensions/ColorExtensions.cs @@ -5,4 +5,9 @@ public static bool IsNullOrTransparent(this Color color) { return color == null || color == Colors.Transparent; } + + public static Brush ToSolidColorBrush(this Color color) + { + return new SolidColorBrush(color); + } } From be53994ea98093cb475a471a0fc12a4a56c3a5df Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Thu, 28 Sep 2023 13:40:31 +0300 Subject: [PATCH 4/6] Workaround for TabView --- src/UraniumUI.Material/Controls/TabView.cs | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/UraniumUI.Material/Controls/TabView.cs b/src/UraniumUI.Material/Controls/TabView.cs index 31eab8d2..c3a47152 100644 --- a/src/UraniumUI.Material/Controls/TabView.cs +++ b/src/UraniumUI.Material/Controls/TabView.cs @@ -39,11 +39,14 @@ public partial class TabView : Grid { new GenericTriggerAction((sender) => { - sender.SetAppThemeColor( - Grid.BackgroundColorProperty, - ColorResource.GetColor("Primary").WithAlpha(.2f), - ColorResource.GetColor("PrimaryDark").WithAlpha(.2f) - ); + + //sender.SetAppThemeColor( + // Grid.BackgroundColorProperty, + // ColorResource.GetColor("Primary").WithAlpha(.2f), + // ColorResource.GetColor("PrimaryDark").WithAlpha(.2f) + // ); + // TODO: Find a way to set app theme color repeatedly. + sender.BackgroundColor = ColorResource.GetColor("Primary", "PrimaryDark").WithAlpha(.2f); var box = (sender.Children.FirstOrDefault(x => x is BoxView) as BoxView); @@ -51,7 +54,9 @@ public partial class TabView : Grid sender.FadeTo(1); var button = sender.Children.FirstOrDefault(x=>x is Button) as Button; - button?.SetAppThemeColor(Button.TextColorProperty, ColorResource.GetColor("Primary"), ColorResource.GetColor("PrimaryDark")); + //button?.SetAppThemeColor(Button.TextColorProperty, ColorResource.GetColor("Primary"), ColorResource.GetColor("PrimaryDark")); + // TODO: Find a way to set app theme color repeatedly. + button.TextColor = ColorResource.GetColor("Primary", "PrimaryDark"); }) } }); @@ -72,7 +77,9 @@ public partial class TabView : Grid sender.FadeTo(.5); var button = sender.Children.FirstOrDefault(x=>x is Button) as Button; - button?.SetAppThemeColor(Button.TextColorProperty, ColorResource.GetColor("OnBackground"), ColorResource.GetColor("OnBackgroundDark")); + //button?.SetAppThemeColor(Button.TextColorProperty, ColorResource.GetColor("OnBackground"), ColorResource.GetColor("OnBackgroundDark")); + // TODO: Find a way to set app theme color repeatedly. + button.TextColor = ColorResource.GetColor("OnBackground", "OnBackgroundDark"); }) } }); From 031628ce25fb61ff21f2497d5892e80a13d3cc87 Mon Sep 17 00:00:00 2001 From: Enis Necipoglu Date: Thu, 28 Sep 2023 13:40:37 +0300 Subject: [PATCH 5/6] Update ValidationsPage.xaml --- demo/UraniumApp/Pages/ValidationsPage.xaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/demo/UraniumApp/Pages/ValidationsPage.xaml b/demo/UraniumApp/Pages/ValidationsPage.xaml index a89b929b..ee2a9fda 100644 --- a/demo/UraniumApp/Pages/ValidationsPage.xaml +++ b/demo/UraniumApp/Pages/ValidationsPage.xaml @@ -20,13 +20,10 @@ - - - - Date: Fri, 29 Sep 2023 18:57:11 +0300 Subject: [PATCH 6/6] Fix codefactor problem --- src/UraniumUI.Material/Controls/TabView.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/UraniumUI.Material/Controls/TabView.cs b/src/UraniumUI.Material/Controls/TabView.cs index c3a47152..a60903fb 100644 --- a/src/UraniumUI.Material/Controls/TabView.cs +++ b/src/UraniumUI.Material/Controls/TabView.cs @@ -39,7 +39,6 @@ public partial class TabView : Grid { new GenericTriggerAction((sender) => { - //sender.SetAppThemeColor( // Grid.BackgroundColorProperty, // ColorResource.GetColor("Primary").WithAlpha(.2f),