More fixes

aritchie · Apr 3, 2024 · e583137 · e583137
1 parent b3029d9
commit e583137
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 39 deletions.
diff --git a/sample/Sample/Pages/ProgressPage.xaml b/sample/Sample/Pages/ProgressPage.xaml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace=Samples.ViewModels"
+             xmlns:local="clr-namespace:Samples.ViewModels"
+             x:DataType="local:ProgressViewModel"
              x:Class="Samples.ProgressPage"
              Title="Progress">
     <ContentPage.Content>
         <ListView ItemsSource="{Binding Commands}">
             <ListView.ItemTemplate>
-                <DataTemplate>
-                    <TextCell Text="{Binding Text}" Command="{Binding Command}" />
+                <DataTemplate x:DataType="local:CommandViewModel">
+                    <TextCell Text="{Binding Text}"
+                              Command="{Binding Command}" />
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>

diff --git a/sample/Sample/Pages/SettingsPage.xaml b/sample/Sample/Pages/SettingsPage.xaml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace=Samples.ViewModels"
+             xmlns:local="clr-namespace:Samples.ViewModels"
+             x:DataType="local:SettingsViewModel"
              x:Class="Samples.SettingsPage"
              Title="Settings/Themes">
     <ContentPage.Content>
-        <StackLayout>
+        <VerticalStackLayout>
             <Button Text="Load Standard Theme" Command="{Binding StandardSettings}" />
             <Button Text="Load Funny Theme" Command="{Binding LoadAbnormalSettings}" />
-        </StackLayout>
+        </VerticalStackLayout>
     </ContentPage.Content>
 </ContentPage>
diff --git a/sample/Sample/Pages/SpecificCasesPage.xaml b/sample/Sample/Pages/SpecificCasesPage.xaml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace=Samples.ViewModels"
+             xmlns:local="clr-namespace:Samples.ViewModels"
+             x:DataType="local:SpecificCasesViewModel"
              x:Class="Samples.SpecificCasesPage"
              Title="Specific Cases">
     <ContentPage.Content>
         <CollectionView ItemsSource="{Binding Commands}">
             <CollectionView.ItemTemplate>
-                <DataTemplate>
-                    <Button Text="{Binding Text}" Command="{Binding Command}" />
+                <DataTemplate x:DataType="local:CommandViewModel">
+                    <Button Text="{Binding Text}"
+                            Command="{Binding Command}" />
                 </DataTemplate>
             </CollectionView.ItemTemplate>
         </CollectionView>

diff --git a/sample/Sample/Pages/StandardPage.xaml b/sample/Sample/Pages/StandardPage.xaml
@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace=Samples.ViewModels"
+             xmlns:local="clr-namespace:Samples.ViewModels"
+             x:DataType="local:StandardViewModel"
              x:Class="Samples.StandardPage"
              Title="Standard Dialogs">
     <ContentPage.Content>
-        <StackLayout>
-            <StackLayout Orientation="Horizontal">
+        <VerticalStackLayout>
+            <HorizontalStackLayout>
                 <Switch IsToggled="{Binding AutoCancel}" />
                 <Label Text="Cancel After 3 Seconds" />
-            </StackLayout>
+            </HorizontalStackLayout>
+
             <ListView ItemsSource="{Binding Commands}">
                 <ListView.ItemTemplate>
-                    <DataTemplate>
-                        <TextCell Text="{Binding Text}" Command="{Binding Command}" />
+                    <DataTemplate x:DataType="local:CommandViewModel">
+                        <TextCell Text="{Binding Text}"
+                                  Command="{Binding Command}" />
                     </DataTemplate>
                 </ListView.ItemTemplate>
             </ListView>
-        </StackLayout>
+        </VerticalStackLayout>
     </ContentPage.Content>
 </ContentPage>
diff --git a/sample/Sample/Pages/ToastsPage.xaml b/sample/Sample/Pages/ToastsPage.xaml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace=Samples.ViewModels"
+             xmlns:local="clr-namespace:Samples.ViewModels"
+             x:DataType="local:ToastsViewModel"
              x:Class="Samples.ToastsPage"
              Title="Toasts">
     <ContentPage.Content>

diff --git a/sample/Sample/Resources/Images/icon.png b/sample/Sample/Resources/Images/icon.png
diff --git a/sample/Sample/Resources/Raw/AboutAssets.txt b/sample/Sample/Resources/Raw/AboutAssets.txt
diff --git a/sample/Sample/Sample.csproj b/sample/Sample/Sample.csproj
@@ -25,18 +25,26 @@
         <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
     </PropertyGroup>
 
+    <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
+      <CreatePackage>false</CreatePackage>
+    </PropertyGroup>
     <ItemGroup>
         <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
 
         <MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
 
         <MauiImage Include="Resources\Images\*" />
         <MauiFont Include="Resources\Fonts\*" />
-        <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
     </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.14" />
         <ProjectReference Include="..\..\src\Acr.UserDialogs\Acr.UserDialogs.csproj" />
     </ItemGroup>
+    <ItemGroup>
+      <None Remove="Resources\Raw\" />
+    </ItemGroup>
+    <ItemGroup>
+      <Folder Include="Resources\Raw\" />
+    </ItemGroup>
 </Project>
diff --git a/sample/Sample/ViewModels/ProgressViewModel.cs b/sample/Sample/ViewModels/ProgressViewModel.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Input;
+using System.Windows.Input;
 using Acr.UserDialogs;
 
 

diff --git a/src/Acr.UserDialogs/Platforms/ios/TTGSnackbar.cs b/src/Acr.UserDialogs/Platforms/ios/TTGSnackbar.cs
@@ -3,7 +3,6 @@
 using UIKit;
 
 
-
 namespace TTG
 {
     public enum TTGSnackbarAnimationType

diff --git a/src/Acr.UserDialogs/Platforms/ios/UserDialogsImpl.cs b/src/Acr.UserDialogs/Platforms/ios/UserDialogsImpl.cs
@@ -252,6 +252,9 @@ protected virtual void AddActionSheetOption(ActionSheetOption opt, UIAlertContro
             if (opt.ItemIcon != null)
             {
                 var icon = UIImage.FromBundle(opt.ItemIcon);
+                if (icon == null)
+                    throw new InvalidOperationException("Invalid Icon Name: " + opt.ItemIcon);
+
                 alertAction.SetValueForKey(icon, new NSString("image"));
             }
             controller.AddAction(alertAction);