diff --git a/src/AdvancedCalculator.csproj b/src.4.7/AdvancedCalculator.csproj similarity index 97% rename from src/AdvancedCalculator.csproj rename to src.4.7/AdvancedCalculator.csproj index 31139ad..cbb9a38 100644 --- a/src/AdvancedCalculator.csproj +++ b/src.4.7/AdvancedCalculator.csproj @@ -8,11 +8,12 @@ WinExe AdvancedCalculator AdvancedCalculator - v4.7.1 + v4.8 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 true + AnyCPU @@ -97,7 +98,6 @@ Resources.Designer.cs - SettingsSingleFileGenerator Settings.Designer.cs diff --git a/src.4.7/AdvancedCalculator.sln b/src.4.7/AdvancedCalculator.sln new file mode 100644 index 0000000..7a45e38 --- /dev/null +++ b/src.4.7/AdvancedCalculator.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27703.2026 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedCalculator", "AdvancedCalculator.csproj", "{05F9F945-8B05-4FDC-82E8-74538C0E6B0C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {05F9F945-8B05-4FDC-82E8-74538C0E6B0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {05F9F945-8B05-4FDC-82E8-74538C0E6B0C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {05F9F945-8B05-4FDC-82E8-74538C0E6B0C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {05F9F945-8B05-4FDC-82E8-74538C0E6B0C}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {68575B5E-E0A7-4DC5-B2C9-66A991BCDCBE} + EndGlobalSection +EndGlobal diff --git a/src/App.config b/src.4.7/App.config similarity index 59% rename from src/App.config rename to src.4.7/App.config index 787dcbe..4bfa005 100644 --- a/src/App.config +++ b/src.4.7/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/src/App.xaml b/src.4.7/App.xaml similarity index 100% rename from src/App.xaml rename to src.4.7/App.xaml diff --git a/src/App.xaml.cs b/src.4.7/App.xaml.cs similarity index 100% rename from src/App.xaml.cs rename to src.4.7/App.xaml.cs diff --git a/src/FunctionDefinitonItem.cs b/src.4.7/FunctionDefinitonItem.cs similarity index 100% rename from src/FunctionDefinitonItem.cs rename to src.4.7/FunctionDefinitonItem.cs diff --git a/src/HistoryItem.cs b/src.4.7/HistoryItem.cs similarity index 100% rename from src/HistoryItem.cs rename to src.4.7/HistoryItem.cs diff --git a/src/IconFont.cs b/src.4.7/IconFont.cs similarity index 100% rename from src/IconFont.cs rename to src.4.7/IconFont.cs diff --git a/src/MainWindow.xaml b/src.4.7/MainWindow.xaml similarity index 100% rename from src/MainWindow.xaml rename to src.4.7/MainWindow.xaml diff --git a/src/MainWindow.xaml.cs b/src.4.7/MainWindow.xaml.cs similarity index 100% rename from src/MainWindow.xaml.cs rename to src.4.7/MainWindow.xaml.cs diff --git a/src/Properties/AssemblyInfo.cs b/src.4.7/Properties/AssemblyInfo.cs similarity index 100% rename from src/Properties/AssemblyInfo.cs rename to src.4.7/Properties/AssemblyInfo.cs diff --git a/src/Properties/Resources.Designer.cs b/src.4.7/Properties/Resources.Designer.cs similarity index 86% rename from src/Properties/Resources.Designer.cs rename to src.4.7/Properties/Resources.Designer.cs index 399e881..523741d 100644 --- a/src/Properties/Resources.Designer.cs +++ b/src.4.7/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace AdvancedCalculator.Properties -{ - - +namespace AdvancedCalculator.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,51 +19,43 @@ namespace AdvancedCalculator.Properties // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AdvancedCalculator.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/src/Properties/Resources.resx b/src.4.7/Properties/Resources.resx similarity index 100% rename from src/Properties/Resources.resx rename to src.4.7/Properties/Resources.resx diff --git a/src/Properties/Settings.Designer.cs b/src.4.7/Properties/Settings.Designer.cs similarity index 82% rename from src/Properties/Settings.Designer.cs rename to src.4.7/Properties/Settings.Designer.cs index 8a305ec..290c200 100644 --- a/src/Properties/Settings.Designer.cs +++ b/src.4.7/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // //------------------------------------------------------------------------------ -namespace AdvancedCalculator.Properties -{ - - +namespace AdvancedCalculator.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.12.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/src/Properties/Settings.settings b/src.4.7/Properties/Settings.settings similarity index 100% rename from src/Properties/Settings.settings rename to src.4.7/Properties/Settings.settings diff --git a/src/VariableItem.cs b/src.4.7/VariableItem.cs similarity index 100% rename from src/VariableItem.cs rename to src.4.7/VariableItem.cs diff --git a/src/calculator-variant-black.png b/src.4.7/calculator-variant-black.png similarity index 100% rename from src/calculator-variant-black.png rename to src.4.7/calculator-variant-black.png diff --git a/src/icon.ico b/src.4.7/icon.ico similarity index 100% rename from src/icon.ico rename to src.4.7/icon.ico diff --git a/src/materialdesignicons-webfont.ttf b/src.4.7/materialdesignicons-webfont.ttf similarity index 100% rename from src/materialdesignicons-webfont.ttf rename to src.4.7/materialdesignicons-webfont.ttf diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 0000000..8afdcb6 --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,454 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# Tye +.tye/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +## +## Visual studio for Mac +## + + +# globs +Makefile.in +*.userprefs +*.usertasks +config.make +config.status +aclocal.m4 +install-sh +autom4te.cache/ +*.tar.gz +tarballs/ +test-results/ + +# Mac bundle stuff +*.dmg +*.app + +# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# JetBrains Rider +.idea/ +*.sln.iml + +## +## Visual Studio Code +## +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json diff --git a/src/AdvancedCalculator.Android/AdvancedCalculator.Android.csproj b/src/AdvancedCalculator.Android/AdvancedCalculator.Android.csproj new file mode 100644 index 0000000..2e19804 --- /dev/null +++ b/src/AdvancedCalculator.Android/AdvancedCalculator.Android.csproj @@ -0,0 +1,28 @@ + + + Exe + net8.0-android + 21 + enable + com.CompanyName.AvaloniaTest + 1 + 1.0 + apk + False + + + + + Resources\drawable\Icon.png + + + + + + + + + + + + diff --git a/src/AdvancedCalculator.Android/Icon.png b/src/AdvancedCalculator.Android/Icon.png new file mode 100644 index 0000000..41a2a61 Binary files /dev/null and b/src/AdvancedCalculator.Android/Icon.png differ diff --git a/src/AdvancedCalculator.Android/MainActivity.cs b/src/AdvancedCalculator.Android/MainActivity.cs new file mode 100644 index 0000000..41a44d9 --- /dev/null +++ b/src/AdvancedCalculator.Android/MainActivity.cs @@ -0,0 +1,22 @@ +using Android.App; +using Android.Content.PM; + +using Avalonia; +using Avalonia.Android; + +namespace AdvancedCalculator.Android; + +[Activity( + Label = "AdvancedCalculator.Android", + Theme = "@style/MyTheme.NoActionBar", + Icon = "@drawable/icon", + MainLauncher = true, + ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)] +public class MainActivity : AvaloniaMainActivity +{ + protected override AppBuilder CustomizeAppBuilder(AppBuilder builder) + { + return base.CustomizeAppBuilder(builder) + .WithInterFont(); + } +} diff --git a/src/AdvancedCalculator.Android/Properties/AndroidManifest.xml b/src/AdvancedCalculator.Android/Properties/AndroidManifest.xml new file mode 100644 index 0000000..a561c56 --- /dev/null +++ b/src/AdvancedCalculator.Android/Properties/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/AdvancedCalculator.Android/Resources/drawable/splash_screen.xml b/src/AdvancedCalculator.Android/Resources/drawable/splash_screen.xml new file mode 100644 index 0000000..2e920b4 --- /dev/null +++ b/src/AdvancedCalculator.Android/Resources/drawable/splash_screen.xml @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/src/AdvancedCalculator.Android/Resources/values-night/colors.xml b/src/AdvancedCalculator.Android/Resources/values-night/colors.xml new file mode 100644 index 0000000..3d47b6f --- /dev/null +++ b/src/AdvancedCalculator.Android/Resources/values-night/colors.xml @@ -0,0 +1,4 @@ + + + #212121 + diff --git a/src/AdvancedCalculator.Android/Resources/values/colors.xml b/src/AdvancedCalculator.Android/Resources/values/colors.xml new file mode 100644 index 0000000..59279d5 --- /dev/null +++ b/src/AdvancedCalculator.Android/Resources/values/colors.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + diff --git a/src/AdvancedCalculator.Android/Resources/values/styles.xml b/src/AdvancedCalculator.Android/Resources/values/styles.xml new file mode 100644 index 0000000..6e534de --- /dev/null +++ b/src/AdvancedCalculator.Android/Resources/values/styles.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/src/AdvancedCalculator.Browser/AdvancedCalculator.Browser.csproj b/src/AdvancedCalculator.Browser/AdvancedCalculator.Browser.csproj new file mode 100644 index 0000000..e60e69a --- /dev/null +++ b/src/AdvancedCalculator.Browser/AdvancedCalculator.Browser.csproj @@ -0,0 +1,15 @@ + + + net8.0-browser + Exe + true + + + + + + + + + + diff --git a/src/AdvancedCalculator.Browser/Program.cs b/src/AdvancedCalculator.Browser/Program.cs new file mode 100644 index 0000000..a975286 --- /dev/null +++ b/src/AdvancedCalculator.Browser/Program.cs @@ -0,0 +1,17 @@ +using System.Runtime.Versioning; +using System.Threading.Tasks; + +using AdvancedCalculator; + +using Avalonia; +using Avalonia.Browser; + +internal sealed partial class Program +{ + private static Task Main(string[] args) => BuildAvaloniaApp() + .WithInterFont() + .StartBrowserAppAsync("out"); + + public static AppBuilder BuildAvaloniaApp() + => AppBuilder.Configure(); +} diff --git a/src/AdvancedCalculator.Browser/Properties/AssemblyInfo.cs b/src/AdvancedCalculator.Browser/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..fb78795 --- /dev/null +++ b/src/AdvancedCalculator.Browser/Properties/AssemblyInfo.cs @@ -0,0 +1 @@ +[assembly:System.Runtime.Versioning.SupportedOSPlatform("browser")] diff --git a/src/AdvancedCalculator.Browser/Properties/launchSettings.json b/src/AdvancedCalculator.Browser/Properties/launchSettings.json new file mode 100644 index 0000000..73fee13 --- /dev/null +++ b/src/AdvancedCalculator.Browser/Properties/launchSettings.json @@ -0,0 +1,13 @@ +{ + "profiles": { + "AdvancedCalculator.Browser": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:7169;http://localhost:5235", + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + } + } +} diff --git a/src/AdvancedCalculator.Browser/runtimeconfig.template.json b/src/AdvancedCalculator.Browser/runtimeconfig.template.json new file mode 100644 index 0000000..b96a943 --- /dev/null +++ b/src/AdvancedCalculator.Browser/runtimeconfig.template.json @@ -0,0 +1,10 @@ +{ + "wasmHostProperties": { + "perHostConfig": [ + { + "name": "browser", + "host": "browser" + } + ] + } +} \ No newline at end of file diff --git a/src/AdvancedCalculator.Browser/wwwroot/app.css b/src/AdvancedCalculator.Browser/wwwroot/app.css new file mode 100644 index 0000000..1d6f754 --- /dev/null +++ b/src/AdvancedCalculator.Browser/wwwroot/app.css @@ -0,0 +1,58 @@ +/* HTML styles for the splash screen */ +.avalonia-splash { + position: absolute; + height: 100%; + width: 100%; + background: white; + font-family: 'Outfit', sans-serif; + justify-content: center; + align-items: center; + display: flex; + pointer-events: none; +} + +/* Light theme styles */ +@media (prefers-color-scheme: light) { + .avalonia-splash { + background: white; + } + + .avalonia-splash h2 { + color: #1b2a4e; + } + + .avalonia-splash a { + color: #0D6EFD; + } +} + +@media (prefers-color-scheme: dark) { + .avalonia-splash { + background: #1b2a4e; + } + + .avalonia-splash h2 { + color: white; + } + + .avalonia-splash a { + color: white; + } +} + +.avalonia-splash h2 { + font-weight: 400; + font-size: 1.5rem; +} + +.avalonia-splash a { + text-decoration: none; + font-size: 2.5rem; + display: block; +} + +.avalonia-splash.splash-close { + transition: opacity 200ms, display 200ms; + display: none; + opacity: 0; +} diff --git a/src/AdvancedCalculator.Browser/wwwroot/favicon.ico b/src/AdvancedCalculator.Browser/wwwroot/favicon.ico new file mode 100644 index 0000000..da8d49f Binary files /dev/null and b/src/AdvancedCalculator.Browser/wwwroot/favicon.ico differ diff --git a/src/AdvancedCalculator.Browser/wwwroot/index.html b/src/AdvancedCalculator.Browser/wwwroot/index.html new file mode 100644 index 0000000..a8dee0a --- /dev/null +++ b/src/AdvancedCalculator.Browser/wwwroot/index.html @@ -0,0 +1,36 @@ + + + + + AdvancedCalculator + + + + + + +
+
+

+ Powered by + + + + + + + + + + + + + + +

+
+
+ + + + diff --git a/src/AdvancedCalculator.Browser/wwwroot/main.js b/src/AdvancedCalculator.Browser/wwwroot/main.js new file mode 100644 index 0000000..bf1555e --- /dev/null +++ b/src/AdvancedCalculator.Browser/wwwroot/main.js @@ -0,0 +1,13 @@ +import { dotnet } from './_framework/dotnet.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(); + +const config = dotnetRuntime.getConfig(); + +await dotnetRuntime.runMain(config.mainAssemblyName, [globalThis.location.href]); diff --git a/src/AdvancedCalculator.Desktop/AdvancedCalculator.Desktop.csproj b/src/AdvancedCalculator.Desktop/AdvancedCalculator.Desktop.csproj new file mode 100644 index 0000000..286df85 --- /dev/null +++ b/src/AdvancedCalculator.Desktop/AdvancedCalculator.Desktop.csproj @@ -0,0 +1,19 @@ + + + WinExe + + net8.0 + enable + true + app.manifest + + + + + + + + + + diff --git a/src/AdvancedCalculator.Desktop/Program.cs b/src/AdvancedCalculator.Desktop/Program.cs new file mode 100644 index 0000000..b4d5e7e --- /dev/null +++ b/src/AdvancedCalculator.Desktop/Program.cs @@ -0,0 +1,23 @@ +using System; + +using Avalonia; + +namespace AdvancedCalculator.Desktop; + +class Program +{ + // Initialization code. Don't use any Avalonia, third-party APIs or any + // SynchronizationContext-reliant code before AppMain is called: things aren't initialized + // yet and stuff might break. + [STAThread] + public static void Main(string[] args) => BuildAvaloniaApp() + .StartWithClassicDesktopLifetime(args); + + // Avalonia configuration, don't remove; also used by visual designer. + public static AppBuilder BuildAvaloniaApp() + => AppBuilder.Configure() + .UsePlatformDetect() + .WithInterFont() + .LogToTrace(); + +} diff --git a/src/AdvancedCalculator.Desktop/app.manifest b/src/AdvancedCalculator.Desktop/app.manifest new file mode 100644 index 0000000..e0ce8d0 --- /dev/null +++ b/src/AdvancedCalculator.Desktop/app.manifest @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/src/AdvancedCalculator.sln b/src/AdvancedCalculator.sln index 7a45e38..0598078 100644 --- a/src/AdvancedCalculator.sln +++ b/src/AdvancedCalculator.sln @@ -1,9 +1,15 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2026 +# Visual Studio Version 17 +VisualStudioVersion = 17.12.35707.178 d17.12 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedCalculator", "AdvancedCalculator.csproj", "{05F9F945-8B05-4FDC-82E8-74538C0E6B0C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedCalculator", "AdvancedCalculator\AdvancedCalculator.csproj", "{690788A5-B548-4BE1-8B01-966BBE907C2D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedCalculator.Android", "AdvancedCalculator.Android\AdvancedCalculator.Android.csproj", "{816B4AC8-25A3-483C-9AC2-8DA1EB8687AC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedCalculator.Browser", "AdvancedCalculator.Browser\AdvancedCalculator.Browser.csproj", "{8FF50DD6-23E0-4CF2-A98D-0FBC649DB2DD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedCalculator.Desktop", "AdvancedCalculator.Desktop\AdvancedCalculator.Desktop.csproj", "{E39C7683-E7DA-4730-B805-7F1F9DB624CB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,15 +17,26 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {05F9F945-8B05-4FDC-82E8-74538C0E6B0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05F9F945-8B05-4FDC-82E8-74538C0E6B0C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05F9F945-8B05-4FDC-82E8-74538C0E6B0C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05F9F945-8B05-4FDC-82E8-74538C0E6B0C}.Release|Any CPU.Build.0 = Release|Any CPU + {690788A5-B548-4BE1-8B01-966BBE907C2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {690788A5-B548-4BE1-8B01-966BBE907C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {690788A5-B548-4BE1-8B01-966BBE907C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {690788A5-B548-4BE1-8B01-966BBE907C2D}.Release|Any CPU.Build.0 = Release|Any CPU + {816B4AC8-25A3-483C-9AC2-8DA1EB8687AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {816B4AC8-25A3-483C-9AC2-8DA1EB8687AC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {816B4AC8-25A3-483C-9AC2-8DA1EB8687AC}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {816B4AC8-25A3-483C-9AC2-8DA1EB8687AC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {816B4AC8-25A3-483C-9AC2-8DA1EB8687AC}.Release|Any CPU.Build.0 = Release|Any CPU + {816B4AC8-25A3-483C-9AC2-8DA1EB8687AC}.Release|Any CPU.Deploy.0 = Release|Any CPU + {8FF50DD6-23E0-4CF2-A98D-0FBC649DB2DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8FF50DD6-23E0-4CF2-A98D-0FBC649DB2DD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8FF50DD6-23E0-4CF2-A98D-0FBC649DB2DD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8FF50DD6-23E0-4CF2-A98D-0FBC649DB2DD}.Release|Any CPU.Build.0 = Release|Any CPU + {E39C7683-E7DA-4730-B805-7F1F9DB624CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E39C7683-E7DA-4730-B805-7F1F9DB624CB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E39C7683-E7DA-4730-B805-7F1F9DB624CB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E39C7683-E7DA-4730-B805-7F1F9DB624CB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {68575B5E-E0A7-4DC5-B2C9-66A991BCDCBE} - EndGlobalSection EndGlobal diff --git a/src/AdvancedCalculator/AdvancedCalculator.csproj b/src/AdvancedCalculator/AdvancedCalculator.csproj new file mode 100644 index 0000000..17a3295 --- /dev/null +++ b/src/AdvancedCalculator/AdvancedCalculator.csproj @@ -0,0 +1,22 @@ + + + net8.0 + enable + latest + true + + + + + + + + + + + + + + + + diff --git a/src/AdvancedCalculator/App.axaml b/src/AdvancedCalculator/App.axaml new file mode 100644 index 0000000..ed5dc8d --- /dev/null +++ b/src/AdvancedCalculator/App.axaml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/src/AdvancedCalculator/App.axaml.cs b/src/AdvancedCalculator/App.axaml.cs new file mode 100644 index 0000000..e967b3b --- /dev/null +++ b/src/AdvancedCalculator/App.axaml.cs @@ -0,0 +1,41 @@ +using AdvancedCalculator.ViewModels; +using AdvancedCalculator.Views; + +using Avalonia; +using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Data.Core.Plugins; +using Avalonia.Markup.Xaml; + +namespace AdvancedCalculator; + +public partial class App : Application +{ + public override void Initialize() + { + AvaloniaXamlLoader.Load(this); + } + + public override void OnFrameworkInitializationCompleted() + { + // Line below is needed to remove Avalonia data validation. + // Without this line you will get duplicate validations from both Avalonia and CT + BindingPlugins.DataValidators.RemoveAt(0); + + if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop) + { + desktop.MainWindow = new MainWindow + { + DataContext = new MainViewModel() + }; + } + else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform) + { + singleViewPlatform.MainView = new MainView + { + DataContext = new MainViewModel() + }; + } + + base.OnFrameworkInitializationCompleted(); + } +} diff --git a/src/AdvancedCalculator/Assets/avalonia-logo.ico b/src/AdvancedCalculator/Assets/avalonia-logo.ico new file mode 100644 index 0000000..da8d49f Binary files /dev/null and b/src/AdvancedCalculator/Assets/avalonia-logo.ico differ diff --git a/src/AdvancedCalculator/ViewModels/MainViewModel.cs b/src/AdvancedCalculator/ViewModels/MainViewModel.cs new file mode 100644 index 0000000..aba0c84 --- /dev/null +++ b/src/AdvancedCalculator/ViewModels/MainViewModel.cs @@ -0,0 +1,6 @@ +namespace AdvancedCalculator.ViewModels; + +public partial class MainViewModel : ViewModelBase +{ + public string Greeting => "Welcome to Avalonia!"; +} diff --git a/src/AdvancedCalculator/ViewModels/ViewModelBase.cs b/src/AdvancedCalculator/ViewModels/ViewModelBase.cs new file mode 100644 index 0000000..b5ad5e3 --- /dev/null +++ b/src/AdvancedCalculator/ViewModels/ViewModelBase.cs @@ -0,0 +1,7 @@ +using CommunityToolkit.Mvvm.ComponentModel; + +namespace AdvancedCalculator.ViewModels; + +public class ViewModelBase : ObservableObject +{ +} diff --git a/src/AdvancedCalculator/Views/MainView.axaml b/src/AdvancedCalculator/Views/MainView.axaml new file mode 100644 index 0000000..eef679f --- /dev/null +++ b/src/AdvancedCalculator/Views/MainView.axaml @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/src/AdvancedCalculator/Views/MainView.axaml.cs b/src/AdvancedCalculator/Views/MainView.axaml.cs new file mode 100644 index 0000000..61e43cc --- /dev/null +++ b/src/AdvancedCalculator/Views/MainView.axaml.cs @@ -0,0 +1,11 @@ +using Avalonia.Controls; + +namespace AdvancedCalculator.Views; + +public partial class MainView : UserControl +{ + public MainView() + { + InitializeComponent(); + } +} diff --git a/src/AdvancedCalculator/Views/MainWindow.axaml b/src/AdvancedCalculator/Views/MainWindow.axaml new file mode 100644 index 0000000..ee6679b --- /dev/null +++ b/src/AdvancedCalculator/Views/MainWindow.axaml @@ -0,0 +1,12 @@ + + + diff --git a/src/AdvancedCalculator/Views/MainWindow.axaml.cs b/src/AdvancedCalculator/Views/MainWindow.axaml.cs new file mode 100644 index 0000000..981a711 --- /dev/null +++ b/src/AdvancedCalculator/Views/MainWindow.axaml.cs @@ -0,0 +1,11 @@ +using Avalonia.Controls; + +namespace AdvancedCalculator.Views; + +public partial class MainWindow : Window +{ + public MainWindow() + { + InitializeComponent(); + } +} diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 0000000..89dc443 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,6 @@ + + + enable + 11.1.0 + + diff --git a/src/packages.config b/src/packages.config deleted file mode 100644 index 111741e..0000000 --- a/src/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file