Remove AppSettings, change design

mysteryx93 · Jul 14, 2023 · def6ab6 · def6ab6
1 parent 803fdf2
commit def6ab6
Show file tree

Hide file tree

Showing 83 changed files with 333 additions and 599 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/Demo.CrossPlatform.Android.csproj b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/Demo.CrossPlatform.Android.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Android" Version="11.0.0-rc1.1" />
+    <PackageReference Include="Avalonia.Android" Version="11.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/MainActivity.cs b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/MainActivity.cs
@@ -1,10 +1,22 @@
 using Android.App;
 using Android.Content.PM;
+using Avalonia;
 using Avalonia.Android;
+using Avalonia.ReactiveUI;
 
 namespace Demo.CrossPlatform.Android;
 
-[Activity(Label = "Avalonia11.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
-public class MainActivity : AvaloniaMainActivity
+[Activity(
+    Label = "Avalonia11.Android",
+    Theme = "@style/MyTheme.NoActionBar",
+    Icon = "@drawable/icon",
+    MainLauncher = true,
+    ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
+public class MainActivity : AvaloniaMainActivity<App>
 {
+    protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
+    {
+        return base.CustomizeAppBuilder(builder)
+            .UseReactiveUI();
+    }
 }
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/SplashActivity.cs b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Android/SplashActivity.cs
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Desktop/Demo.CrossPlatform.Desktop.csproj b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Desktop/Demo.CrossPlatform.Desktop.csproj
@@ -16,7 +16,6 @@
     <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="FluentAvalonia.UI.Windowing" Version="2.0.0-preview5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Desktop/Program.cs b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Desktop/Program.cs
@@ -1,7 +1,6 @@
 using System;
 using Avalonia;
 using Avalonia.ReactiveUI;
-using FluentAvalonia.UI.Windowing;
 
 namespace Demo.CrossPlatform.Desktop;
 

diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Web/Demo.CrossPlatform.Web.csproj b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform.Web/Demo.CrossPlatform.Web.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Browser.Blazor" Version="11.0.0-rc1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.2" />
+    <PackageReference Include="Avalonia.Browser.Blazor" Version="11.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.9" />
   </ItemGroup>
 </Project>
diff --git a/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Demo.CrossPlatform.csproj b/samples/Avalonia/CrossPlatform/Demo.CrossPlatform/Demo.CrossPlatform.csproj
@@ -17,13 +17,12 @@
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-    <PackageReference Include="ReactiveUI.Fody" Version="18.4.44" />
+    <PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />
     <PackageReference Include="Splat" Version="14.6.37" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator" Version="1.1.93">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Avalonia/CrossPlatform/Directory.Build.props b/samples/Avalonia/CrossPlatform/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.0.0-rc1.1</AvaloniaVersion>
+    <AvaloniaVersion>11.0.0</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/samples/Avalonia/Demo.ActivateNonModalDialog/Demo.ActivateNonModalDialog.csproj b/samples/Avalonia/Demo.ActivateNonModalDialog/Demo.ActivateNonModalDialog.csproj
@@ -9,12 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
+    <PackageReference Include="Avalonia" Version="11.0.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc1.1" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-rc1.1" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator" Version="1.1.93">
       <PrivateAssets>all</PrivateAssets>

diff --git a/samples/Avalonia/Demo.CloseNonModalDialog/Demo.CloseNonModalDialog.csproj b/samples/Avalonia/Demo.CloseNonModalDialog/Demo.CloseNonModalDialog.csproj
@@ -8,12 +8,12 @@
     <RootNamespace>Demo.Avalonia.CloseNonModalDialog</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
+    <PackageReference Include="Avalonia" Version="11.0.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc1.1" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-rc1.1" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
     <PackageReference Include="Splat.DependencyInjection.SourceGenerator" Version="1.1.93">
       <PrivateAssets>all</PrivateAssets>

diff --git a/samples/Avalonia/Demo.CustomOpenFolderDialog/CustomDialogFactory.cs b/samples/Avalonia/Demo.CustomOpenFolderDialog/CustomDialogFactory.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using Avalonia.Win32;
 using HanumanInstitute.MvvmDialogs;
 using HanumanInstitute.MvvmDialogs.FrameworkDialogs;
 using HanumanInstitute.MvvmDialogs.Avalonia;
@@ -9,6 +8,7 @@
 using System.Collections.Generic;
 using HanumanInstitute.MvvmDialogs.FileSystem;
 using HanumanInstitute.MvvmDialogs.PathInfo;
+using Avalonia.Platform;
 
 namespace Demo.Avalonia.CustomOpenFolderDialog;
 
@@ -27,19 +27,19 @@ public CustomDialogFactory(IPathInfoFactory infoFactory, IDialogFactory? chain =
     }
 
     /// <inheritdoc />
-    public override async Task<object?> ShowDialogAsync<TSettings>(IView? owner, TSettings settings, AppDialogSettingsBase appSettings) =>
+    public override async Task<object?> ShowDialogAsync<TSettings>(IView? owner, TSettings settings) =>
         settings switch
         {
-            OpenFolderDialogSettings s => await ShowOpenFolderDialogAsync(owner, s, appSettings),
-            _ => base.ShowDialogAsync(owner, settings, appSettings)
+            OpenFolderDialogSettings s => await ShowOpenFolderDialogAsync(owner, s),
+            _ => base.ShowDialogAsync(owner, settings)
         };
 
-    private async Task<IReadOnlyList<IDialogStorageFolder>> ShowOpenFolderDialogAsync(IView? owner, OpenFolderDialogSettings settings, AppDialogSettingsBase appSettings)
+    private async Task<IReadOnlyList<IDialogStorageFolder>> ShowOpenFolderDialogAsync(IView? owner, OpenFolderDialogSettings settings)
     {
         if (owner == null) throw new ArgumentNullException(nameof(owner));
 
         var window = TopLevel.GetTopLevel(owner.GetRef());
-        var platformImpl = window?.PlatformImpl as WindowImpl;
+        var platformImpl = window?.PlatformImpl as IWindowImpl;
         if (platformImpl == null)
         {
             throw new NullReferenceException("Cannot obtain HWND handle for owner.");