diff --git a/FlowerApp/Extensions.cs b/FlowerApp/Extensions.cs index 8dd31ee..84f8368 100644 --- a/FlowerApp/Extensions.cs +++ b/FlowerApp/Extensions.cs @@ -44,7 +44,7 @@ internal sealed class Extensions values.FirstOrDefault() is string oAuth) { Constants.SetAuthorization(oAuth); - var result = await content.ReadFromJsonAsync(cancellation); + var result = await content.ReadFromJsonAsync(cancellationToken: cancellation); return result; } } diff --git a/FlowerApp/FlowerApp.csproj b/FlowerApp/FlowerApp.csproj index 796117a..a845e31 100644 --- a/FlowerApp/FlowerApp.csproj +++ b/FlowerApp/FlowerApp.csproj @@ -1,7 +1,7 @@  - net8.0-android;net8.0-ios + net7.0-android;net7.0-ios Exe Blahblah.FlowerApp @@ -15,6 +15,7 @@ org.blahblah.flowerstory + 2a32c3a1-d02e-450d-b524-5dbea90f13ed 0.2.731 @@ -24,11 +25,11 @@ 23.0 - + android-x64 - + android-x64;android-arm64 apk true @@ -39,12 +40,12 @@ manual - + Apple Development Flower Story Development - + Apple Distribution Flower Story Ad-Hoc @@ -52,7 +53,6 @@ - @@ -74,11 +74,11 @@ - - - - - + + + + + @@ -96,6 +96,9 @@ ResXFileCodeGenerator Localizations.Designer.cs + + ResXFileCodeGenerator + @@ -116,10 +119,4 @@ MSBuild:Compile - - - - diff --git a/FlowerApp/LoginPage.xaml b/FlowerApp/LoginPage.xaml index 0566362..db35648 100644 --- a/FlowerApp/LoginPage.xaml +++ b/FlowerApp/LoginPage.xaml @@ -4,7 +4,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:l="clr-namespace:Blahblah.FlowerApp" xmlns:ctl="clr-namespace:Blahblah.FlowerApp.Controls" - xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit" x:Class="Blahblah.FlowerApp.LoginPage" x:Name="loginPage" x:DataType="l:LoginPage"> diff --git a/FlowerApp/MainPage.xaml b/FlowerApp/MainPage.xaml index 3ed6319..a7e4671 100644 --- a/FlowerApp/MainPage.xaml +++ b/FlowerApp/MainPage.xaml @@ -4,7 +4,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:l="clr-namespace:Blahblah.FlowerApp" xmlns:ctl="clr-namespace:Blahblah.FlowerApp.Controls" - xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit" x:Class="Blahblah.FlowerApp.HomePage" x:Name="homePage" x:DataType="l:HomePage" diff --git a/FlowerApp/MauiProgram.cs b/FlowerApp/MauiProgram.cs index 590b971..1e935fa 100644 --- a/FlowerApp/MauiProgram.cs +++ b/FlowerApp/MauiProgram.cs @@ -1,5 +1,5 @@ using Blahblah.FlowerApp.Data; -using CommunityToolkit.Maui; +//using CommunityToolkit.Maui; #if DEBUG using Microsoft.Extensions.Logging; #endif @@ -13,7 +13,7 @@ public static class MauiProgram var builder = MauiApp.CreateBuilder(); builder .UseMauiApp() - .UseMauiCommunityToolkit() + //.UseMauiCommunityToolkit() .ConfigureFonts(fonts => { fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");