make calc app cross platform and run in browser.

AvaloniaUI · Oct 20, 2022 · 11b925d · 11b925d
1 parent 5787104
commit 11b925d
Show file tree

Hide file tree

Showing 35 changed files with 416 additions and 63 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Calc.Browser/.DS_Store b/Calc.Browser/.DS_Store
diff --git a/Calc.Browser/AppBundle/Logo.svg b/Calc.Browser/AppBundle/Logo.svg
diff --git a/Calc.Browser/AppBundle/app.css b/Calc.Browser/AppBundle/app.css
@@ -0,0 +1,73 @@
+.highlight {
+    color: white;
+    font-size: 2.5rem;
+    display: block;
+}
+
+.purple {
+    color: #8b44ac;
+}
+
+.icon {
+    opacity : 0.05;
+    height: 35%;
+    width: 35%;
+    position : absolute;
+    background-repeat: no-repeat;
+    right: 0px;
+    bottom: 0px;
+    margin-right: 3%;
+    margin-bottom: 5%;
+    z-index: 5000;
+    background-position: right bottom;
+    pointer-events: none;
+}
+
+#out {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    text-align: center;
+    height: 100vh;
+    overflow:hidden;
+}
+
+#avalonia-splash a{
+    color: whitesmoke;
+    text-decoration: none;
+}
+
+.center {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100vh;
+}
+
+#avalonia-splash {
+    position: relative;
+    height: 100%;
+    width: 100%;
+    color: whitesmoke;
+    background: #1b2a4e;
+    font-family: 'Nunito', sans-serif;
+    background-position: center;
+    background-size: cover;
+    background-repeat: no-repeat;
+    justify-content: center;
+    align-items: center;
+}
+
+.splash-close {
+    animation: fadeout 0.5s linear 1s forwards;
+}
+
+@keyframes fadeout {
+    0% { 
+        opacity:100%;
+    }
+    100% { 
+        opacity:0;
+        visibility: collapse;
+    }
+}
diff --git a/Assets/avalonia-logo.ico → Calc.Browser/AppBundle/favicon.ico b/Assets/avalonia-logo.ico → Calc.Browser/AppBundle/favicon.ico
diff --git a/Calc.Browser/AppBundle/index.html b/Calc.Browser/AppBundle/index.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>Avalonia UI Playground</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <base href="/" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Nunito:wght@200;300;400;500;600;700&family=Open+Sans:wght@600&display=swap" rel="stylesheet">
+    <link rel="modulepreload" href="./main.js" />
+    <link rel="modulepreload" href="./interop.js" />
+    <link rel="modulepreload" href="./dotnet.js" />
+    <link rel="modulepreload" href="./avalonia.js" />
+    <link rel="stylesheet" href="./app.css" />
+    <link rel="preconnect" href="https://fonts.googleapis.com">    
+</head>
+
+<body style="margin: 0px">
+    <div id="out">                
+        <img class="icon" src="Logo.svg" alt="Avalonia Logo"/>
+        <div id="avalonia-splash"> 
+            <div class="center">
+                <h2 class="purple">                   
+                    Powered by
+                    <a class="highlight" href="https://www.avaloniaui.net/" target="_blank">Avalonia UI</a></h2>              
+            </div>             
+        </div>
+    </div>
+    <script type='module' src="./main.js"></script>
+</body>
+
+</html>
diff --git a/Calc.Browser/AppBundle/main.js b/Calc.Browser/AppBundle/main.js
@@ -0,0 +1,16 @@
+import { dotnet } from './dotnet.js'
+import { registerAvaloniaModule } from './avalonia.js';
+
+const is_browser = typeof window != "undefined";
+if (!is_browser) throw new Error(`Expected to be running in a browser`);
+
+const dotnetRuntime = await dotnet
+    .withDiagnosticTracing(false)
+    .withApplicationArgumentsFromQuery()
+    .create();
+
+await registerAvaloniaModule(dotnetRuntime);
+
+const config = dotnetRuntime.getConfig();
+
+await dotnetRuntime.runMainAndExit(config.mainAssemblyName, [window.location.search]);
diff --git a/Calc.Browser/Calc.Browser.csproj b/Calc.Browser/Calc.Browser.csproj
@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
+    <WasmMainJSPath>AppBundle\main.js</WasmMainJSPath>
+    <OutputType>Exe</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
+    <WasmBuildNative>true</WasmBuildNative>
+    <EmccFlags>-sVERBOSE -sERROR_ON_UNDEFINED_SYMBOLS=0</EmccFlags>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <RunAOTCompilation>true</RunAOTCompilation>
+    <PublishTrimmed>true</PublishTrimmed>
+    <TrimMode>full</TrimMode>
+    <WasmBuildNative>true</WasmBuildNative>
+    <InvariantGlobalization>true</InvariantGlobalization>
+    <WasmEnableSIMD>true</WasmEnableSIMD>
+    <EmccCompileOptimizationFlag>-O3</EmccCompileOptimizationFlag>
+    <EmccLinkOptimizationFlag>-O3</EmccLinkOptimizationFlag>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <TrimmerRootDescriptor Include="Roots.xml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <WasmExtraFilesToDeploy Include="AppBundle\app.css" />
+    <WasmExtraFilesToDeploy Include="AppBundle\favicon.ico" />
+    <WasmExtraFilesToDeploy Include="AppBundle\index.html" />
+    <WasmExtraFilesToDeploy Include="AppBundle\Logo.svg" />
+    <WasmExtraFilesToDeploy Include="AppBundle\main.js" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Avalonia.Web" Version="$(AvaloniaVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Calc\Calc.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Calc.Browser/Program.cs b/Calc.Browser/Program.cs
@@ -0,0 +1,16 @@
+using System.Runtime.Versioning;
+using Avalonia;
+using Avalonia.Web;
+using Calc;
+
+[assembly:SupportedOSPlatform("browser")]
+
+internal partial class Program
+{
+    private static void Main(string[] args) =>
+        BuildAvaloniaApp()
+            .SetupBrowserApp("out");
+
+    public static AppBuilder BuildAvaloniaApp()
+        => AppBuilder.Configure<App>();
+}
diff --git a/Calc.Browser/Roots.xml b/Calc.Browser/Roots.xml
@@ -0,0 +1,43 @@
+<linker>
+
+  <!-- App -->
+
+  <assembly fullname="XamlPlayground" preserve="All" />
+  <assembly fullname="XamlPlayground.Wasm" preserve="All" />
+
+  <!-- Avalonia Themes -->
+
+  <assembly fullname="Avalonia.Themes.Fluent" preserve="All" />
+  <assembly fullname="Avalonia.Themes.Simple" preserve="All" />
+
+  <!-- Avalonia Core -->
+
+  <assembly fullname="Avalonia" preserve="All" />
+  <assembly fullname="Avalonia.Base" preserve="All" />
+  <assembly fullname="Avalonia.Controls" preserve="All" />
+  <assembly fullname="Avalonia.Dialogs" preserve="All" />
+  <assembly fullname="Avalonia.Markup" preserve="All" />
+  <assembly fullname="Avalonia.Markup.Xaml" preserve="All" />
+  <assembly fullname="Avalonia.Markup.Xaml.Loader" preserve="All" />
+  <assembly fullname="Avalonia.MicroCom" preserve="All" />
+
+  <!-- Avalonia Web -->
+
+  <assembly fullname="Avalonia.OpenGL" preserve="All" />
+  <assembly fullname="Avalonia.Skia" preserve="All" />
+  <assembly fullname="Avalonia.Web" preserve="All" />
+
+  <!-- Avalonia Behaviors -->
+
+  <assembly fullname="Avalonia.Xaml.Interactions" preserve="All" />
+  <assembly fullname="Avalonia.Xaml.Interactivity" preserve="All" />
+
+  <!-- AvaloniaEdit -->
+
+  <assembly fullname="AvaloniaEdit" preserve="All" />
+
+  <!-- AvaloniaEdit -->
+
+  <assembly fullname="Octokit" preserve="All" />
+
+</linker>
diff --git a/Calc.Browser/runtimeconfig.template.json b/Calc.Browser/runtimeconfig.template.json
@@ -0,0 +1,11 @@
+{
+    "wasmHostProperties": {
+        "perHostConfig": [
+            {
+                "name": "browser",
+                "html-path": "index.html",
+                "Host": "browser"
+            }
+        ]
+    }
+}
diff --git a/Calc.Desktop/Calc.Desktop.csproj b/Calc.Desktop/Calc.Desktop.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>net7.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
+        <TrimMode>copyused</TrimMode>
+    </PropertyGroup>
+    <ItemGroup>
+        <AvaloniaResource Include="Assets\**"/>
+        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
+        <ProjectReference Include="..\Calc\Calc.csproj"/>
+    </ItemGroup>
+</Project>
diff --git a/Program.cs → Calc.Desktop/Program.cs b/Program.cs → Calc.Desktop/Program.cs
diff --git a/Calc.csproj b/Calc.csproj
diff --git a/Calc.sln b/Calc.sln
@@ -0,0 +1,41 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Calc", "Calc\Calc.csproj", "{2BADC6A0-42BC-4C6D-B97F-62485C051DFC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Calc.Desktop", "Calc.Desktop\Calc.Desktop.csproj", "{A1D52ADE-D1A1-4E48-9212-96DA6F69987C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionFiles", "SolutionFiles", "{7B0CD07C-A43F-41CE-9A81-9DC22B8F2578}"
+	ProjectSection(SolutionItems) = preProject
+		global.json = global.json
+		Directory.Build.props = Directory.Build.props
+		nuget.config = nuget.config
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Calc.Browser", "Calc.Browser\Calc.Browser.csproj", "{45063CD8-19B9-4241-9C02-2CD904BED0FC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2BADC6A0-42BC-4C6D-B97F-62485C051DFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BADC6A0-42BC-4C6D-B97F-62485C051DFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BADC6A0-42BC-4C6D-B97F-62485C051DFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BADC6A0-42BC-4C6D-B97F-62485C051DFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1D52ADE-D1A1-4E48-9212-96DA6F69987C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1D52ADE-D1A1-4E48-9212-96DA6F69987C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1D52ADE-D1A1-4E48-9212-96DA6F69987C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1D52ADE-D1A1-4E48-9212-96DA6F69987C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45063CD8-19B9-4241-9C02-2CD904BED0FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45063CD8-19B9-4241-9C02-2CD904BED0FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45063CD8-19B9-4241-9C02-2CD904BED0FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45063CD8-19B9-4241-9C02-2CD904BED0FC}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/Calc/.DS_Store b/Calc/.DS_Store
diff --git a/App.axaml → Calc/App.axaml b/App.axaml → Calc/App.axaml
diff --git a/App.axaml.cs → Calc/App.axaml.cs b/App.axaml.cs → Calc/App.axaml.cs
@@ -19,7 +19,14 @@ public override void OnFrameworkInitializationCompleted()
             {
                 desktop.MainWindow = new MainWindow
                 {
-                    DataContext = new MainWindowViewModel(),
+                    DataContext = new MainWindowViewModel()
+                };
+            }
+            else if (ApplicationLifetime is ISingleViewApplicationLifetime singleView)
+            {
+                singleView.MainView = new MainView
+                {
+                    DataContext = new MainWindowViewModel()
                 };
             }
 

diff --git a/Calc/Assets/avalonia-logo.ico b/Calc/Assets/avalonia-logo.ico
diff --git a/Calc/Calc.csproj b/Calc/Calc.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>net7.0</TargetFramework>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+    <ItemGroup>
+        <AvaloniaResource Include="Assets\**" />
+        <TrimmableAssembly Include="Avalonia.Themes.Fluent" />
+        <TrimmableAssembly Include="Avalonia.Themes.Default" />
+        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Material.Avalonia" Version="3.0.0-avalonia11-preview2" />
+        <PackageReference Include="Material.Icons.Avalonia" Version="1.2.0" />
+        <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
+    </ItemGroup>
+</Project>
diff --git a/Models/Calculation.cs → Calc/Models/Calculation.cs b/Models/Calculation.cs → Calc/Models/Calculation.cs
diff --git a/Models/Calculator.cs → Calc/Models/Calculator.cs b/Models/Calculator.cs → Calc/Models/Calculator.cs
diff --git a/Models/MyStringBuilder.cs → Calc/Models/MyStringBuilder.cs b/Models/MyStringBuilder.cs → Calc/Models/MyStringBuilder.cs
diff --git a/Models/Operator.cs → Calc/Models/Operator.cs b/Models/Operator.cs → Calc/Models/Operator.cs
diff --git a/Models/OperatorChar.cs → Calc/Models/OperatorChar.cs b/Models/OperatorChar.cs → Calc/Models/OperatorChar.cs
diff --git a/ViewLocator.cs → Calc/ViewLocator.cs b/ViewLocator.cs → Calc/ViewLocator.cs
diff --git a/ViewModels/MainWindowViewModel.cs → Calc/ViewModels/MainWindowViewModel.cs b/ViewModels/MainWindowViewModel.cs → Calc/ViewModels/MainWindowViewModel.cs
diff --git a/ViewModels/ViewModelBase.cs → Calc/ViewModels/ViewModelBase.cs b/ViewModels/ViewModelBase.cs → Calc/ViewModels/ViewModelBase.cs