Upgrade to version 1.0.0-rc1.1.0

GameOfLifeMvu.fsproj

@@ -3,16 +3,17 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="Shell.fs" />
     <Compile Include="Program.fs" />
-    <AvaloniaResource Include="**\*.xaml" />
   </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.12" />
-    <PackageReference Include="JaggerJo.Avalonia.FuncUI" Version="0.5.0" />
-    <PackageReference Include="JaggerJo.Avalonia.FuncUI.DSL" Version="0.5.0" />
-    <PackageReference Include="JaggerJo.Avalonia.FuncUI.Elmish" Version="0.5.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-rc1.1" />
+    <PackageReference Include="Avalonia.FuncUI" Version="1.0.0-rc1.1.0" />
+    <PackageReference Include="Avalonia.FuncUI.Elmish" Version="1.0.0-rc1.1.0" />
   </ItemGroup>
+
 </Project>

Program.fs

@@ -1,31 +1,46 @@
 namespace GameOfLifeMvu
 
 open Avalonia
-open Avalonia.Controls.ApplicationLifetimes
-open Avalonia.FuncUI
 open Avalonia.Themes.Fluent
+open Elmish
+open Avalonia.FuncUI.Hosts
+open Avalonia.FuncUI
+open Avalonia.FuncUI.Elmish
+open Avalonia.Controls.ApplicationLifetimes
+
+type MainWindow() as this =
+    inherit HostWindow()
+    do
+        base.Title <- "Game of Life"
+        base.Width <- 800.0
+        base.Height <- 1000.0
+        base.MinWidth <- 800.0
+        base.MinHeight <- 1000.0
 
+        Elmish.Program.mkProgram Shell.init Shell.update Shell.view
+        |> Program.withHost this
+        |> Program.run
 
-/// This is your application you can ose the initialize method to load styles
-/// or handle Life Cycle events of your application
 type App() =
     inherit Application()
 
     override this.Initialize() =
-        this.Styles.Add (FluentTheme(baseUri = null, Mode = FluentThemeMode.Dark))
-        this.Styles.Load "avares://GameOfLifeMvu/Styles.xaml"
+        this.Styles.Add (FluentTheme())
+        this.RequestedThemeVariant <- Styling.ThemeVariant.Dark
 
     override this.OnFrameworkInitializationCompleted() =
         match this.ApplicationLifetime with
         | :? IClassicDesktopStyleApplicationLifetime as desktopLifetime ->
-            desktopLifetime.MainWindow <- Shell.MainWindow()
+            let mainWindow = MainWindow()
+            desktopLifetime.MainWindow <- mainWindow
         | _ -> ()
 
 module Program =
 
     [<EntryPoint>]
-    let main (args: string []) =
-        AppBuilder.Configure<App>()
+    let main(args: string[]) =
+        AppBuilder
+            .Configure<App>()
             .UsePlatformDetect()
             .UseSkia()
-            .StartWithClassicDesktopLifetime(args)
+            .StartWithClassicDesktopLifetime(args)

Shell.fs

@@ -3,12 +3,10 @@ namespace GameOfLifeMvu
 module Shell =
 
     open System
+    open System.Threading
     open Elmish
     open Avalonia.Controls
     open Avalonia.FuncUI.DSL
-    open Avalonia.FuncUI
-    open Avalonia.FuncUI.Hosts
-    open Avalonia.FuncUI.Elmish
     open Avalonia.Controls.Primitives
     open Avalonia.Controls.Shapes
     open Avalonia.Layout
@@ -68,15 +66,16 @@ module Shell =
     type Configuration = {
         Rows: int
         Columns: int
-        CellSize: int
         RefreshIntervalMilliseconds: int
         }
+        with
+        member this.CellSize =
+            (800.0 - 10.0) / float (max this.Rows this.Columns)
 
     let config = {
-        Rows = 50
-        Columns = 50
-        CellSize = 5
-        RefreshIntervalMilliseconds = 500
+        Rows = 250
+        Columns = 250
+        RefreshIntervalMilliseconds = 100
         }
 
     let init () =
@@ -90,12 +89,6 @@ module Shell =
                 )
         { Cells = cells; Running = false; Generation = 0 }, Cmd.none
 
-    let waitAndUpdate =
-        Cmd.OfAsync.perform
-            (fun () -> async { do! Async.Sleep config.RefreshIntervalMilliseconds })
-            ()
-            (fun () -> NextGeneration)
-
     let update (msg: Msg) (state: State): State * Cmd<Msg> =
         match msg with
         | Restart -> init ()
@@ -113,11 +106,22 @@ module Shell =
                     |> Array2D.mapi (fun row col _ ->
                         nextGeneration state.Cells (row, col)
                         )
+                let ctx = SynchronizationContext.Current
+                let cmd =
+                    Cmd.OfAsync.perform
+                        (fun () -> async {
+                            do! Async.Sleep config.RefreshIntervalMilliseconds
+                            do! Async.SwitchToContext ctx
+                            return Msg.NextGeneration
+                            }
+                        )
+                        ()
+                        id
                 { state with
                     Cells = updated;
                     Generation = state.Generation + 1
                 },
-                waitAndUpdate
+                cmd //Cmd.none
             else state, Cmd.none
 
     let deadCell =
@@ -156,8 +160,8 @@ module Shell =
                     UniformGrid.columns state.Columns
                     UniformGrid.rows state.Rows
 
-                    UniformGrid.width (state.Columns * config.CellSize |> float)
-                    UniformGrid.height (state.Rows * config.CellSize |> float)
+                    UniformGrid.width (float state.Columns * config.CellSize |> float)
+                    UniformGrid.height (float state.Rows * config.CellSize |> float)
 
                     UniformGrid.children [
                         for row in 0 .. state.Rows - 1 do
@@ -196,23 +200,3 @@ module Shell =
                     ]
                 ]
             ]
-
-    /// This is the main window of your application
-    /// you can do all sort of useful things here like setting heights and widths
-    /// as well as attaching your dev tools that can be super useful when developing with
-    /// Avalonia
-    type MainWindow() as this =
-        inherit HostWindow()
-        do
-            base.Title <- "Game of Life"
-            base.Width <- 500.0
-            base.Height <- 600.0
-            base.MinWidth <- 500.0
-            base.MinHeight <- 600.0
-
-            //this.VisualRoot.VisualRoot.Renderer.DrawFps <- true
-            //this.VisualRoot.VisualRoot.Renderer.DrawDirtyRects <- true
-
-            Elmish.Program.mkProgram init update view
-            |> Program.withHost this
-            |> Program.run