WIP

aritchie · Apr 3, 2024 · 065d8e3 · 065d8e3
1 parent 290059e
commit 065d8e3
Show file tree

Hide file tree

Showing 19 changed files with 65 additions and 68 deletions.
diff --git a/sample/Sample/App.xaml b/sample/Sample/App.xaml
@@ -1,8 +1,8 @@
 <?xml version = "1.0" encoding = "UTF-8" ?>
 <Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:Sample"
-             x:Class="Sample.App">
+             xmlns:local="clr-namespace:Samples"
+             x:Class="Samples.App">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

diff --git a/sample/Sample/App.xaml.cs b/sample/Sample/App.xaml.cs
@@ -1,14 +1,11 @@
-using Samples;
+namespace Samples;
 
-namespace Sample
+public partial class App : Application
 {
-    public partial class App : Application
+    public App()
     {
-        public App()
-        {
-            InitializeComponent();
+        this.InitializeComponent();
 
-            this.MainPage = new MainPage();
-        }
+        this.MainPage = new MainPage();
     }
 }
diff --git a/sample/Sample/MauiProgram.cs b/sample/Sample/MauiProgram.cs
@@ -1,7 +1,4 @@
-using Acr.UserDialogs;
-using Microsoft.Maui.LifecycleEvents;
-
-namespace Sample;
+namespace Samples;
 
 
 public static class MauiProgram
@@ -18,7 +15,7 @@ public static MauiApp CreateMauiApp()
             });
 
 #if ANDROID
-        UserDialogs.Init(() => Platform.CurrentActivity);
+        Acr.UserDialogs.UserDialogs.Init(() => Platform.CurrentActivity);
 #endif
         return builder.Build();
     }

diff --git a/sample/Sample/Platforms/Android/MainActivity.cs b/sample/Sample/Platforms/Android/MainActivity.cs
@@ -1,11 +1,20 @@
 using Android.App;
 using Android.Content.PM;
-using Android.OS;
 
-namespace Sample
+namespace Samples
 {
-    [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
+    [Activity(
+        Theme = "@style/Maui.SplashTheme", 
+        MainLauncher = true, 
+        ConfigurationChanges = 
+            ConfigChanges.ScreenSize | 
+            ConfigChanges.Orientation | 
+            ConfigChanges.UiMode | 
+            ConfigChanges.ScreenLayout | 
+            ConfigChanges.SmallestScreenSize | 
+            ConfigChanges.Density
+    )]
     public class MainActivity : MauiAppCompatActivity
     {
     }
-}
+}
diff --git a/sample/Sample/Platforms/Android/MainApplication.cs b/sample/Sample/Platforms/Android/MainApplication.cs
@@ -1,7 +1,7 @@
 using Android.App;
 using Android.Runtime;
 
-namespace Sample
+namespace Samples
 {
     [Application]
     public class MainApplication : MauiApplication
@@ -13,4 +13,4 @@ public MainApplication(IntPtr handle, JniHandleOwnership ownership)
 
         protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
     }
-}
+}
diff --git a/sample/Sample/Platforms/MacCatalyst/AppDelegate.cs b/sample/Sample/Platforms/MacCatalyst/AppDelegate.cs
@@ -1,10 +1,10 @@
 using Foundation;
 
-namespace Sample
+namespace Samples
 {
     [Register("AppDelegate")]
     public class AppDelegate : MauiUIApplicationDelegate
     {
         protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
     }
-}
+}
diff --git a/sample/Sample/Platforms/MacCatalyst/Program.cs b/sample/Sample/Platforms/MacCatalyst/Program.cs
@@ -1,8 +1,6 @@
-using ObjCRuntime;
+using UIKit;
 
-using UIKit;
-
-namespace Sample
+namespace Samples
 {
     public class Program
     {
@@ -14,4 +12,4 @@ static void Main(string[] args)
             UIApplication.Main(args, null, typeof(AppDelegate));
         }
     }
-}
+}
diff --git a/sample/Sample/Platforms/Windows/App.xaml b/sample/Sample/Platforms/Windows/App.xaml
@@ -1,8 +1,8 @@
 <maui:MauiWinUIApplication
-    x:Class="Sample.WinUI.App"
+    x:Class="Samples.WinUI.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:maui="using:Microsoft.Maui"
-    xmlns:local="using:Sample.WinUI">
+    xmlns:local="using:Samples.WinUI">
 
 </maui:MauiWinUIApplication>
diff --git a/sample/Sample/Platforms/Windows/App.xaml.cs b/sample/Sample/Platforms/Windows/App.xaml.cs
@@ -3,7 +3,7 @@
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 
-namespace Sample.WinUI
+namespace Samples.WinUI
 {
     /// <summary>
     /// Provides application-specific behavior to supplement the default Application class.

diff --git a/sample/Sample/Platforms/Windows/app.manifest b/sample/Sample/Platforms/Windows/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="Sample.WinUI.app"/>
+  <assemblyIdentity version="1.0.0.0" name="Samples.WinUI.app"/>
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>

diff --git a/sample/Sample/Platforms/iOS/AppDelegate.cs b/sample/Sample/Platforms/iOS/AppDelegate.cs
@@ -1,10 +1,10 @@
 using Foundation;
 
-namespace Sample
+namespace Samples
 {
     [Register("AppDelegate")]
     public class AppDelegate : MauiUIApplicationDelegate
     {
         protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
     }
-}
+}
diff --git a/sample/Sample/Platforms/iOS/Program.cs b/sample/Sample/Platforms/iOS/Program.cs
@@ -1,8 +1,6 @@
-using ObjCRuntime;
+using UIKit;
 
-using UIKit;
-
-namespace Sample
+namespace Samples
 {
     public class Program
     {
@@ -14,4 +12,4 @@ static void Main(string[] args)
             UIApplication.Main(args, null, typeof(AppDelegate));
         }
     }
-}
+}
diff --git a/sample/Sample/ViewModels/SpecificCasesViewModel.cs b/sample/Sample/ViewModels/SpecificCasesViewModel.cs
@@ -123,7 +123,7 @@ await this.Dialogs.AlertAsync(new AlertConfig
                     Text = "Toast with image",
                     Command = new Command(() =>
                     {
-                        var img = Device.RuntimePlatform == Device.UWP ? "ms-appx:///Assets/emoji_cool_small.png" : "emoji_cool_small.png";
+                        var img = DeviceInfo.Platform == DevicePlatform.WinUI ? "ms-appx:///Assets/emoji_cool_small.png" : "emoji_cool_small.png";
                         this.Dialogs.Toast(new ToastConfig("Wow what a cool guy").SetIcon(img));
                     })
                 },

diff --git a/sample/Sample/ViewModels/ToastsViewModel.cs b/sample/Sample/ViewModels/ToastsViewModel.cs
@@ -45,24 +45,24 @@ public ToastsViewModel(IUserDialogs dialogs) : base(dialogs)
         }
 
 
-        static System.Drawing.Color FromHex(string hex)
-        {
-            var c = Color.FromHex(hex);
-            var dc = System.Drawing.Color.FromArgb((int)c.Alpha, (int)c.Red, (int)c.Green, (int)c.Blue);
-            return dc;
-        }
-
-
-        static string ToHex(Color color)
-        {
-            var red = (int)(color.Red * 255);
-            var green = (int)(color.Green * 255);
-            var blue = (int)(color.Blue * 255);
-            //var alpha = (int)(color.A * 255);
-            //var hex = String.Format($"#{red:X2}{green:X2}{blue:X2}{alpha:X2}");
-            var hex = String.Format($"#{red:X2}{green:X2}{blue:X2}");
-            return hex;
-        }
+        //static System.Drawing.Color FromHex(string hex)
+        //{
+        //    var c = Color.FromArgb(hex);
+        //    var dc = System.Drawing.Color.FromArgb((int)c.Alpha, (int)c.Red, (int)c.Green, (int)c.Blue);
+        //    return dc;
+        //}
+
+
+        //static string ToHex(Color color)
+        //{
+        //    var red = (int)(color.Red * 255);
+        //    var green = (int)(color.Green * 255);
+        //    var blue = (int)(color.Blue * 255);
+        //    //var alpha = (int)(color.A * 255);
+        //    //var hex = String.Format($"#{red:X2}{green:X2}{blue:X2}{alpha:X2}");
+        //    var hex = String.Format($"#{red:X2}{green:X2}{blue:X2}");
+        //    return hex;
+        //}
 
 
         public ICommand Open { get; }

diff --git a/src/Acr.UserDialogs/Acr.UserDialogs.csproj b/src/Acr.UserDialogs/Acr.UserDialogs.csproj
@@ -2,6 +2,7 @@
     <PropertyGroup>
         <TargetFrameworks>net8.0;net8.0-ios;net8.0-android;net8.0-maccatalyst;net8.0-macos</TargetFrameworks>
         <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows</TargetFrameworks>
+        <!--<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>-->
         <PackageProjectUrl>https://github.com/aritchie/userdialogs</PackageProjectUrl>
         <Product>$(AssemblyName) ($(TargetFramework))</Product>
         <Authors>Allan Ritchie</Authors>
@@ -57,10 +58,15 @@
         <Compile Include="Platforms\macOS\**\*.cs" />
     </ItemGroup>
 
-    <ItemGroup Condition="$(TargetFramework.StartsWith('windows'))">
+    <ItemGroup Condition="$([MSBuild]::IsOSPlatform('windows'))">
         <Compile Include="Platforms\Shared\**\*.cs" />
         <Compile Include="Platforms\Windows\**\*.cs" />
         <Page Include="Platforms\Windows\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
         <Compile Update="Platforms\Windows\**\*.xaml.cs" SubType="Code" DependentUpon="%(Filename)" />
+
+        <!--
+        <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
+        <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
+        -->
     </ItemGroup>
 </Project>
diff --git a/src/Acr.UserDialogs/Platforms/Windows/ActionSheetViewModel.cs b/src/Acr.UserDialogs/Platforms/Windows/ActionSheetViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Windows.UI.Xaml;
 
 
 namespace Acr.UserDialogs

diff --git a/src/Acr.UserDialogs/Platforms/Windows/TimePickerControl.xaml b/src/Acr.UserDialogs/Platforms/Windows/TimePickerControl.xaml
@@ -1,5 +1,6 @@
 <UserControl
     x:Class="Acr.UserDialogs.TimePickerControl"
+    xmlns:="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

diff --git a/src/Acr.UserDialogs/Platforms/Windows/UserDialogs.cs b/src/Acr.UserDialogs/Platforms/Windows/UserDialogs.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using Windows.UI.Core;
-using Windows.ApplicationModel.Core;
 
 
 namespace Acr.UserDialogs

diff --git a/src/Acr.UserDialogs/Platforms/Windows/UserDialogsImpl.cs b/src/Acr.UserDialogs/Platforms/Windows/UserDialogsImpl.cs
@@ -5,12 +5,6 @@
 using Windows.Foundation;
 using Windows.UI.Core;
 using Windows.UI.Popups;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Media.Imaging;
-using Coding4Fun.Toolkit.Controls;
 using Acr.UserDialogs.Infrastructure;