diff --git a/ChateoApp/Chateo.Server/Chateo.Server.csproj b/ChateoApp/Chateo.Server/Chateo.Server.csproj index ef950c0..5559b9e 100644 --- a/ChateoApp/Chateo.Server/Chateo.Server.csproj +++ b/ChateoApp/Chateo.Server/Chateo.Server.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable diff --git a/ChateoApp/Chateo.Services/Chateo.Services.csproj b/ChateoApp/Chateo.Services/Chateo.Services.csproj index 4769342..01442f7 100644 --- a/ChateoApp/Chateo.Services/Chateo.Services.csproj +++ b/ChateoApp/Chateo.Services/Chateo.Services.csproj @@ -1,7 +1,7 @@ - net8.0-android;net8.0-ios + net10.0-android;net10.0-ios enable enable true @@ -15,8 +15,8 @@ - - + + diff --git a/ChateoApp/Chateo.Shared/Chateo.Shared.csproj b/ChateoApp/Chateo.Shared/Chateo.Shared.csproj index 30402ac..9ed914b 100644 --- a/ChateoApp/Chateo.Shared/Chateo.Shared.csproj +++ b/ChateoApp/Chateo.Shared/Chateo.Shared.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable diff --git a/ChateoApp/Chateo/Chateo.csproj b/ChateoApp/Chateo/Chateo.csproj index adee4db..f6e43e4 100644 --- a/ChateoApp/Chateo/Chateo.csproj +++ b/ChateoApp/Chateo/Chateo.csproj @@ -1,7 +1,7 @@  - net8.0-android;net8.0-ios + net10.0-android;net10.0-ios Exe @@ -17,8 +17,8 @@ 1.0 1 - 14.2 - 14.0 + 16.0 + 16.0 21.0 10.0.17763.0 10.0.17763.0 @@ -47,15 +47,15 @@ - - + + - - - + + + diff --git a/ChateoApp/Chateo/MauiProgram.cs b/ChateoApp/Chateo/MauiProgram.cs index 614b3ce..d73fd6f 100644 --- a/ChateoApp/Chateo/MauiProgram.cs +++ b/ChateoApp/Chateo/MauiProgram.cs @@ -12,9 +12,6 @@ public static MauiApp CreateMauiApp() var builder = MauiApp.CreateBuilder(); builder .UseMauiReactorApp() -#if DEBUG - .EnableMauiReactorHotReload() -#endif .ConfigureFonts(fonts => { fonts.AddFont("Mulish-Regular.ttf", "MulishRegular"); diff --git a/ChateoApp/Chateo/Pages/AvatarPage.cs b/ChateoApp/Chateo/Pages/AvatarPage.cs index aeae54a..dafb0e0 100644 --- a/ChateoApp/Chateo/Pages/AvatarPage.cs +++ b/ChateoApp/Chateo/Pages/AvatarPage.cs @@ -1,5 +1,6 @@ using Chateo.Resources.Styles; -using MauiReactor; +using MauiReactor; +using Theme = Chateo.Resources.Styles.Theme; using System; using System.Collections.Generic; using System.Linq; diff --git a/ChateoApp/Chateo/Pages/ChatsPage.cs b/ChateoApp/Chateo/Pages/ChatsPage.cs index 30df99f..9965453 100644 --- a/ChateoApp/Chateo/Pages/ChatsPage.cs +++ b/ChateoApp/Chateo/Pages/ChatsPage.cs @@ -3,7 +3,8 @@ using Chateo.Services; using Chateo.Shared; using Humanizer; -using MauiReactor; +using MauiReactor; +using Theme = Chateo.Resources.Styles.Theme; using MauiReactor.Shapes; using Microsoft.Extensions.DependencyInjection; using System; diff --git a/ChateoApp/Chateo/Pages/Components/TabBarComponent.cs b/ChateoApp/Chateo/Pages/Components/TabBarComponent.cs index 67cb86c..e274bcd 100644 --- a/ChateoApp/Chateo/Pages/Components/TabBarComponent.cs +++ b/ChateoApp/Chateo/Pages/Components/TabBarComponent.cs @@ -1,5 +1,6 @@ using Chateo.Resources.Styles; -using MauiReactor; +using MauiReactor; +using Theme = Chateo.Resources.Styles.Theme; using MauiReactor.Shapes; using System; using System.Collections.Generic; diff --git a/ChateoApp/Chateo/Pages/ContactsPage.cs b/ChateoApp/Chateo/Pages/ContactsPage.cs index b7b702b..ddc6fcd 100644 --- a/ChateoApp/Chateo/Pages/ContactsPage.cs +++ b/ChateoApp/Chateo/Pages/ContactsPage.cs @@ -3,7 +3,8 @@ using Chateo.Services; using Chateo.Shared; using Humanizer; -using MauiReactor; +using MauiReactor; +using Theme = Chateo.Resources.Styles.Theme; using MauiReactor.Shapes; using Microsoft.Extensions.DependencyInjection; using System; diff --git a/ChateoApp/Chateo/Pages/HomePage.cs b/ChateoApp/Chateo/Pages/HomePage.cs index 525fd89..d1cb23b 100644 --- a/ChateoApp/Chateo/Pages/HomePage.cs +++ b/ChateoApp/Chateo/Pages/HomePage.cs @@ -1,6 +1,7 @@ using Chateo.Pages.Components; using Chateo.Resources.Styles; using MauiReactor; +using Theme = Chateo.Resources.Styles.Theme; using System; namespace Chateo.Pages; diff --git a/ChateoApp/Chateo/Pages/LandingPage.cs b/ChateoApp/Chateo/Pages/LandingPage.cs index 96ac192..53b8ee0 100644 --- a/ChateoApp/Chateo/Pages/LandingPage.cs +++ b/ChateoApp/Chateo/Pages/LandingPage.cs @@ -1,5 +1,6 @@ using Chateo.Resources.Styles; using MauiReactor; +using Theme = Chateo.Resources.Styles.Theme; using System; namespace Chateo.Pages; diff --git a/ChateoApp/Chateo/Pages/MainPage.cs b/ChateoApp/Chateo/Pages/MainPage.cs index 560870a..5d797b1 100644 --- a/ChateoApp/Chateo/Pages/MainPage.cs +++ b/ChateoApp/Chateo/Pages/MainPage.cs @@ -2,6 +2,7 @@ using Chateo.Services; using Chateo.Shared; using MauiReactor; +using Theme = Chateo.Resources.Styles.Theme; using MauiReactor.Parameters; using Microsoft.Extensions.DependencyInjection; using Microsoft.Maui.Storage; diff --git a/ChateoApp/Chateo/Pages/RegisterPage.cs b/ChateoApp/Chateo/Pages/RegisterPage.cs index 1f53630..2d0956b 100644 --- a/ChateoApp/Chateo/Pages/RegisterPage.cs +++ b/ChateoApp/Chateo/Pages/RegisterPage.cs @@ -2,6 +2,7 @@ using Chateo.Services; using Chateo.Shared; using MauiReactor; +using Theme = Chateo.Resources.Styles.Theme; using Microsoft.Extensions.DependencyInjection; using Microsoft.Maui.Storage; using System; diff --git a/ChateoApp/Chateo/Pages/SettingsPage.cs b/ChateoApp/Chateo/Pages/SettingsPage.cs index 78ab689..c9c6fce 100644 --- a/ChateoApp/Chateo/Pages/SettingsPage.cs +++ b/ChateoApp/Chateo/Pages/SettingsPage.cs @@ -1,6 +1,7 @@ using Chateo.Pages.Components; using Chateo.Resources.Styles; -using MauiReactor; +using MauiReactor; +using Theme = Chateo.Resources.Styles.Theme; using MauiReactor.Shapes; using System; using System.Collections.Generic; diff --git a/ChateoApp/Chateo/Pages/UserChatPage.cs b/ChateoApp/Chateo/Pages/UserChatPage.cs index a2616c3..2ae3732 100644 --- a/ChateoApp/Chateo/Pages/UserChatPage.cs +++ b/ChateoApp/Chateo/Pages/UserChatPage.cs @@ -3,6 +3,7 @@ using Chateo.Shared; using Humanizer; using MauiReactor; +using Theme = Chateo.Resources.Styles.Theme; using Microsoft.Extensions.DependencyInjection; using Microsoft.Maui.Controls.PlatformConfiguration; using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;