From b136172183965fc2155af909b528b6be850b6fa1 Mon Sep 17 00:00:00 2001 From: NoobNotFound Date: Tue, 18 Jun 2024 00:49:30 +0530 Subject: [PATCH 01/61] update the updator, add mc 1.21, bump to version 0.7.9 --- .../Emerald.App.Package/Package.WinUI.wapproj | 21 +++++++++---------- .../Emerald.App.Package/Package.appxmanifest | 2 +- .../Emerald.App/Helpers/MCVersionsCreator.cs | 1 + .../Emerald.App/Helpers/Updater/Updater.cs | 13 ++++++++---- Emerald.App/Emerald.App/MainWindow.xaml.cs | 2 +- .../Emerald.App/Strings/en-US/Resources.resw | 8 +++---- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj b/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj index acbf8918..1bd0d770 100644 --- a/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj +++ b/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj @@ -55,9 +55,8 @@ True ..\Emerald.App\Emerald.App.csproj False - 9CBDFA6FDB25BE48AA09759C40DFAB769CF9740A SHA256 - True + False True x86|x64|arm64 D:\Projects\Emerald\Emerald.App\Emerald.App.Package\AppPackages\ @@ -66,31 +65,31 @@ Package.WinUI_TemporaryKey.pfx - Auto + Always - Auto + Always - Auto + Always - Auto + Always - Auto + Always - Auto + Always - Auto + Always - Auto + Always - Auto + Always diff --git a/Emerald.App/Emerald.App.Package/Package.appxmanifest b/Emerald.App/Emerald.App.Package/Package.appxmanifest index 6fcfd00a..0297724c 100644 --- a/Emerald.App/Emerald.App.Package/Package.appxmanifest +++ b/Emerald.App/Emerald.App.Package/Package.appxmanifest @@ -11,7 +11,7 @@ + Version="0.7.9.0" /> Emerald diff --git a/Emerald.App/Emerald.App/Helpers/MCVersionsCreator.cs b/Emerald.App/Emerald.App/Helpers/MCVersionsCreator.cs index 593bc3e4..dcb5ebae 100644 --- a/Emerald.App/Emerald.App/Helpers/MCVersionsCreator.cs +++ b/Emerald.App/Emerald.App/Helpers/MCVersionsCreator.cs @@ -51,6 +51,7 @@ public ObservableCollection CreateVersions() Collection.Add(LoadCustomVers()); } + AddItem("1.21"); AddItem("1.20"); AddItem("1.19"); AddItem("1.18"); diff --git a/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs b/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs index e62f920c..246642bb 100644 --- a/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs +++ b/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs @@ -81,14 +81,18 @@ public async void CheckForUpdates(bool OnlyInformifHigherAvailable = false) if (!rel.Assets.Any(x => x.Name.EndsWith("msixbundle") && x.Name.ToLower().Contains(this.Architecture.ToString().ToLower()))) { TasksHelper.CompleteTask(id, false, "NoMsixUpdate"); - goto Return; + + if (!OnlyInformifHigherAvailable) + MessageBox.Show("Error".Localize(), "NoMsixUpdate".Localize(), Enums.MessageBoxButtons.Ok); + + goto Return; } var asset = rel.Assets.First(x => x.Name.EndsWith("msixbundle") && x.Name.ToLower().Contains(this.Architecture.ToString().ToLower())); if (ver > currentver) { TasksHelper.CompleteTask(id, true, "UpdateAvailable"); - var msg = await MessageBox.Show("UpdateAvailable".Localize(), "##ReleaseNotes".Localize() + "\n\n " + rel.Body,Enums.MessageBoxButtons.CustomWithCancel, "UpdateNow".Localize()); + var msg = await MessageBox.Show("UpdateAvailable".Localize(), "## Version: " + ver.ToString() + "\n\n###ReleaseNotes".Localize() + "\n\n " + rel.Body,Enums.MessageBoxButtons.CustomWithCancel, "UpdateNow".Localize()); if(msg == Enums.MessageBoxResults.Cancel) goto Return; @@ -100,8 +104,7 @@ public async void CheckForUpdates(bool OnlyInformifHigherAvailable = false) if(OnlyInformifHigherAvailable) goto Return; - var msg = await MessageBox.Show("DowngradeAvailable".Localize(), "DowngradeDescription".Localize(),Enums.MessageBoxButtons.CustomWithCancel,"Downgrade".Localize()); - if (msg == Enums.MessageBoxResults.Cancel) + var msg = await MessageBox.Show("DowngradeAvailable".Localize(), "DowngradeDescription".Localize(),Enums.MessageBoxButtons.Ok); goto Return; @@ -117,6 +120,8 @@ public async void CheckForUpdates(bool OnlyInformifHigherAvailable = false) goto Return; } var a = rel.Assets.First(x => x.Name.EndsWith("msixbundle") && x.Name.ToLower().Contains(this.Architecture.ToString().ToLower())); + if(a == null) + goto Return ; DownloadQAndInstallUpdate(a.BrowserDownloadUrl,a.Name); Return: diff --git a/Emerald.App/Emerald.App/MainWindow.xaml.cs b/Emerald.App/Emerald.App/MainWindow.xaml.cs index 7d2efe89..7147aef9 100644 --- a/Emerald.App/Emerald.App/MainWindow.xaml.cs +++ b/Emerald.App/Emerald.App/MainWindow.xaml.cs @@ -210,7 +210,7 @@ void TintColor() }; if (SS.Settings.App.Updates.CheckAtStartup) - App.Current.Updater.CheckForUpdates(); + App.Current.Updater.CheckForUpdates(true); (Content as FrameworkElement).Loaded -= Initialize; } private static void UpdateUI() diff --git a/Emerald.App/Emerald.App/Strings/en-US/Resources.resw b/Emerald.App/Emerald.App/Strings/en-US/Resources.resw index 2c910bf2..54116319 100644 --- a/Emerald.App/Emerald.App/Strings/en-US/Resources.resw +++ b/Emerald.App/Emerald.App/Strings/en-US/Resources.resw @@ -271,7 +271,7 @@ Load Mod - Failed to load the app settings accounts. The version of the setting system is different. You may have recently updated the app. Contact a developer of this app to recover the settings + Failed to load the app settings and accounts. The version of the setting system is different. You may have recently updated the app. Contact a developer of this app to recover the settings Login @@ -710,7 +710,7 @@ Downgrade Available - The current version is higher than the latest version in the servers. You must be using a private beta. Do you want to downgrade? + The current version is higher than the latest version in the servers. You must be using a private beta. Please wait until a higher stable version be available Download Update @@ -719,7 +719,7 @@ Install Update - Failed to find the installer package in the release + Failed to find the installer package in the release for this architecture You are on the latest version @@ -752,6 +752,6 @@ Updates - Automatically update, include prerelease etc.. + Auto update, include prerelease etc.. \ No newline at end of file From 459b624a50e9eba66e41ba1b93db601d6a28c1d0 Mon Sep 17 00:00:00 2001 From: NoobNotFound Date: Mon, 8 Jul 2024 18:45:30 +0530 Subject: [PATCH 02/61] change package certificate --- Emerald.App/Emerald.App.Package/Package.WinUI.wapproj | 1 + Emerald.App/Emerald.App/Emerald.App.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj b/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj index 1bd0d770..c76b14af 100644 --- a/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj +++ b/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj @@ -63,6 +63,7 @@ 0 False Package.WinUI_TemporaryKey.pfx + C36FEB2A573AF2E3DD0737A454F36CB17B8C121C Always diff --git a/Emerald.App/Emerald.App/Emerald.App.csproj b/Emerald.App/Emerald.App/Emerald.App.csproj index c7a83d17..b80e8e74 100644 --- a/Emerald.App/Emerald.App/Emerald.App.csproj +++ b/Emerald.App/Emerald.App/Emerald.App.csproj @@ -17,6 +17,7 @@ + From 5af849ebe7b62052468a3667fe0ab76f82a7b578 Mon Sep 17 00:00:00 2001 From: NoobNotFound Date: Mon, 8 Jul 2024 18:50:31 +0530 Subject: [PATCH 03/61] create new core lib for multi platform --- Emerald.CoreX/Class1.cs | 7 +++++++ Emerald.CoreX/Emerald.CoreX.csproj | 9 +++++++++ Emerald.sln | 22 ++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 Emerald.CoreX/Class1.cs create mode 100644 Emerald.CoreX/Emerald.CoreX.csproj diff --git a/Emerald.CoreX/Class1.cs b/Emerald.CoreX/Class1.cs new file mode 100644 index 00000000..8efea347 --- /dev/null +++ b/Emerald.CoreX/Class1.cs @@ -0,0 +1,7 @@ +namespace Emerald.CoreX +{ + public class Class1 + { + + } +} diff --git a/Emerald.CoreX/Emerald.CoreX.csproj b/Emerald.CoreX/Emerald.CoreX.csproj new file mode 100644 index 00000000..fa71b7ae --- /dev/null +++ b/Emerald.CoreX/Emerald.CoreX.csproj @@ -0,0 +1,9 @@ + + + + net8.0 + enable + enable + + + diff --git a/Emerald.sln b/Emerald.sln index 053ff471..d6e0b24a 100644 --- a/Emerald.sln +++ b/Emerald.sln @@ -19,6 +19,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{2BB1 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmlLib", "CMLLib\CmlLib\CmlLib.csproj", "{7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emerald.CoreX", "Emerald.CoreX\Emerald.CoreX.csproj", "{13795E09-8131-4716-9EBC-970952E9F360}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -123,6 +125,26 @@ Global {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|x64.Build.0 = Release|Any CPU {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|x86.ActiveCfg = Release|Any CPU {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|x86.Build.0 = Release|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Debug|Any CPU.Build.0 = Debug|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Debug|ARM.ActiveCfg = Debug|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Debug|ARM.Build.0 = Debug|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Debug|ARM64.Build.0 = Debug|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Debug|x64.ActiveCfg = Debug|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Debug|x64.Build.0 = Debug|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Debug|x86.ActiveCfg = Debug|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Debug|x86.Build.0 = Debug|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Release|Any CPU.ActiveCfg = Release|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Release|Any CPU.Build.0 = Release|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Release|ARM.ActiveCfg = Release|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Release|ARM.Build.0 = Release|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Release|ARM64.ActiveCfg = Release|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Release|ARM64.Build.0 = Release|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Release|x64.ActiveCfg = Release|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Release|x64.Build.0 = Release|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Release|x86.ActiveCfg = Release|Any CPU + {13795E09-8131-4716-9EBC-970952E9F360}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From c749d5a481b29d863c8437c22cd06dc6bd9d0fc4 Mon Sep 17 00:00:00 2001 From: NoobNotFound Date: Mon, 8 Jul 2024 20:44:30 +0530 Subject: [PATCH 04/61] add some files to CoreX --- Emerald.CoreX/Class1.cs | 7 ----- Emerald.CoreX/Core.cs | 13 ++++++++ Emerald.CoreX/Emerald.CoreX.csproj | 6 ++++ Emerald.CoreX/Enums/MCVersionType.cs | 18 +++++++++++ Emerald.CoreX/Installers/Fabric.cs | 12 ++++++++ Emerald.CoreX/Installers/Forge.cs | 12 ++++++++ .../Installers/IModLoaderInstaller.cs | 13 ++++++++ Emerald.CoreX/Installers/LiteLoader.cs | 12 ++++++++ Emerald.CoreX/Installers/Optifine.cs | 12 ++++++++ Emerald.CoreX/Models/MCVersion.cs | 30 +++++++++++++++++++ Emerald.CoreX/Modrinth.cs | 12 ++++++++ 11 files changed, 140 insertions(+), 7 deletions(-) delete mode 100644 Emerald.CoreX/Class1.cs create mode 100644 Emerald.CoreX/Core.cs create mode 100644 Emerald.CoreX/Enums/MCVersionType.cs create mode 100644 Emerald.CoreX/Installers/Fabric.cs create mode 100644 Emerald.CoreX/Installers/Forge.cs create mode 100644 Emerald.CoreX/Installers/IModLoaderInstaller.cs create mode 100644 Emerald.CoreX/Installers/LiteLoader.cs create mode 100644 Emerald.CoreX/Installers/Optifine.cs create mode 100644 Emerald.CoreX/Models/MCVersion.cs create mode 100644 Emerald.CoreX/Modrinth.cs diff --git a/Emerald.CoreX/Class1.cs b/Emerald.CoreX/Class1.cs deleted file mode 100644 index 8efea347..00000000 --- a/Emerald.CoreX/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Emerald.CoreX -{ - public class Class1 - { - - } -} diff --git a/Emerald.CoreX/Core.cs b/Emerald.CoreX/Core.cs new file mode 100644 index 00000000..4f8ef55d --- /dev/null +++ b/Emerald.CoreX/Core.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; +using CmlLib.Core; +using CmlLib.Core.VersionMetadata; +namespace Emerald.CoreX; + +public class Core(ILogger logger) +{ + public MinecraftLauncher Launcher { get; set; } + public void InitializeLauncher() + { + Launcher = new MinecraftLauncher(); + } +} \ No newline at end of file diff --git a/Emerald.CoreX/Emerald.CoreX.csproj b/Emerald.CoreX/Emerald.CoreX.csproj index fa71b7ae..ed9e2beb 100644 --- a/Emerald.CoreX/Emerald.CoreX.csproj +++ b/Emerald.CoreX/Emerald.CoreX.csproj @@ -6,4 +6,10 @@ enable + + + + + + diff --git a/Emerald.CoreX/Enums/MCVersionType.cs b/Emerald.CoreX/Enums/MCVersionType.cs new file mode 100644 index 00000000..6d90c3d0 --- /dev/null +++ b/Emerald.CoreX/Enums/MCVersionType.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Emerald.CoreX.Enums +{ + public enum MCVersionType + { + Vanilla, + Fabric, + Lite, + Forge, + Optifine, + Undefined + } +} diff --git a/Emerald.CoreX/Installers/Fabric.cs b/Emerald.CoreX/Installers/Fabric.cs new file mode 100644 index 00000000..53c693ed --- /dev/null +++ b/Emerald.CoreX/Installers/Fabric.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Emerald.CoreX.Installers +{ + internal class Fabric : IModLoaderInstaller + { + } +} diff --git a/Emerald.CoreX/Installers/Forge.cs b/Emerald.CoreX/Installers/Forge.cs new file mode 100644 index 00000000..a51d3718 --- /dev/null +++ b/Emerald.CoreX/Installers/Forge.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Emerald.CoreX.Installers +{ + internal class Forge : IModLoaderInstaller + { + } +} diff --git a/Emerald.CoreX/Installers/IModLoaderInstaller.cs b/Emerald.CoreX/Installers/IModLoaderInstaller.cs new file mode 100644 index 00000000..a24f9e5b --- /dev/null +++ b/Emerald.CoreX/Installers/IModLoaderInstaller.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Emerald.CoreX.Installers +{ + internal interface IModLoaderInstaller + { + + } +} diff --git a/Emerald.CoreX/Installers/LiteLoader.cs b/Emerald.CoreX/Installers/LiteLoader.cs new file mode 100644 index 00000000..8798c807 --- /dev/null +++ b/Emerald.CoreX/Installers/LiteLoader.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Emerald.CoreX.Installers +{ + internal class LiteLoader: IModLoaderInstaller + { + } +} diff --git a/Emerald.CoreX/Installers/Optifine.cs b/Emerald.CoreX/Installers/Optifine.cs new file mode 100644 index 00000000..dec37deb --- /dev/null +++ b/Emerald.CoreX/Installers/Optifine.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Emerald.CoreX.Installers +{ + internal class Optifine : IModLoaderInstaller + { + } +} diff --git a/Emerald.CoreX/Models/MCVersion.cs b/Emerald.CoreX/Models/MCVersion.cs new file mode 100644 index 00000000..82fd834e --- /dev/null +++ b/Emerald.CoreX/Models/MCVersion.cs @@ -0,0 +1,30 @@ +using CmlLib.Core.Version; +using CmlLib.Core.VersionMetadata; +using CommunityToolkit.Mvvm.ComponentModel; +using Emerald.CoreX.Enums; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Emerald.CoreX.Models +{ + public partial class MCVersion + { + public MCVersionType Type { get; private set; } + public MVersionType ReleaseType { get; private set; } + + public string Name { get; private set; } + + public string DisplayName { get; set; } + + public IVersionMetadata Metadata { get; private set; } + + public bool Local { get; private set; } + + public MCVersion[] Subversions { get; private set; } + + } +} diff --git a/Emerald.CoreX/Modrinth.cs b/Emerald.CoreX/Modrinth.cs new file mode 100644 index 00000000..ecafabd6 --- /dev/null +++ b/Emerald.CoreX/Modrinth.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Emerald.CoreX +{ + internal class Modrinth + { + } +} From f33b9e482a65975bac46967fbe8da48dc1413133 Mon Sep 17 00:00:00 2001 From: NoobNotFound Date: Mon, 8 Jul 2024 20:57:56 +0530 Subject: [PATCH 05/61] Moved to .Net 8 --- Emerald.App/Emerald.App/Emerald.App.csproj | 5 +++-- Emerald.Core/Emerald.Core.csproj | 25 +++++++++------------- Emerald.Core/Launcher.cs | 1 - 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/Emerald.App/Emerald.App/Emerald.App.csproj b/Emerald.App/Emerald.App/Emerald.App.csproj index b80e8e74..898eef95 100644 --- a/Emerald.App/Emerald.App/Emerald.App.csproj +++ b/Emerald.App/Emerald.App/Emerald.App.csproj @@ -2,12 +2,13 @@ WinExe - net7.0-windows10.0.22000.0 + net8.0-windows10.0.22000.0 10.0.17763.0 Emerald.WinUI app.manifest x86;x64;arm64 - win10-x86;win10-x64;win10-arm64 + win-x86;win-x64;win-arm64 + win10-x86;win10-x64;win10-arm64 true Debug;Release enable diff --git a/Emerald.Core/Emerald.Core.csproj b/Emerald.Core/Emerald.Core.csproj index 8bb6d6e5..83657dd3 100644 --- a/Emerald.Core/Emerald.Core.csproj +++ b/Emerald.Core/Emerald.Core.csproj @@ -1,20 +1,15 @@  - - net7.0-windows10.0.22000.0 - enable - enable - Emerald.Core - Debug;Release - 10.0.17763.0 - win10-x86;win10-x64 - + + net8.0 + enable + enable + - - - - - - + + + + + diff --git a/Emerald.Core/Launcher.cs b/Emerald.Core/Launcher.cs index 33b44c6b..17ffd0d2 100644 --- a/Emerald.Core/Launcher.cs +++ b/Emerald.Core/Launcher.cs @@ -12,7 +12,6 @@ using Emerald.Core.Tasks; using ProjBobcat.Class.Model.Optifine; using System.ComponentModel; -using Windows.System; using ProgressChangedEventArgs = Emerald.Core.Args.ProgressChangedEventArgs; namespace Emerald.Core From 85bb0d3d572023c1180746a435df6d6c8d7658b4 Mon Sep 17 00:00:00 2001 From: Lamparter Date: Fri, 12 Jul 2024 21:32:24 +0100 Subject: [PATCH 06/61] Remove win10 runtime condition Signed-off-by: Lamparter --- Emerald.App/Emerald.App/Emerald.App.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/Emerald.App/Emerald.App/Emerald.App.csproj b/Emerald.App/Emerald.App/Emerald.App.csproj index 898eef95..2fe002e1 100644 --- a/Emerald.App/Emerald.App/Emerald.App.csproj +++ b/Emerald.App/Emerald.App/Emerald.App.csproj @@ -8,7 +8,6 @@ app.manifest x86;x64;arm64 win-x86;win-x64;win-arm64 - win10-x86;win10-x64;win10-arm64 true Debug;Release enable From 7867dab0264e7b50878ef5bcd744c7a7fbf03897 Mon Sep 17 00:00:00 2001 From: codefactor-io Date: Fri, 12 Jul 2024 20:34:06 +0000 Subject: [PATCH 07/61] [CodeFactor] Apply fixes --- Emerald.CoreX/Installers/IModLoaderInstaller.cs | 3 +-- Emerald.CoreX/Models/MCVersion.cs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Emerald.CoreX/Installers/IModLoaderInstaller.cs b/Emerald.CoreX/Installers/IModLoaderInstaller.cs index a24f9e5b..a91b12c6 100644 --- a/Emerald.CoreX/Installers/IModLoaderInstaller.cs +++ b/Emerald.CoreX/Installers/IModLoaderInstaller.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,6 +8,5 @@ namespace Emerald.CoreX.Installers { internal interface IModLoaderInstaller { - } } diff --git a/Emerald.CoreX/Models/MCVersion.cs b/Emerald.CoreX/Models/MCVersion.cs index 82fd834e..84248297 100644 --- a/Emerald.CoreX/Models/MCVersion.cs +++ b/Emerald.CoreX/Models/MCVersion.cs @@ -1,4 +1,4 @@ -using CmlLib.Core.Version; +using CmlLib.Core.Version; using CmlLib.Core.VersionMetadata; using CommunityToolkit.Mvvm.ComponentModel; using Emerald.CoreX.Enums; @@ -25,6 +25,5 @@ public partial class MCVersion public bool Local { get; private set; } public MCVersion[] Subversions { get; private set; } - } } From caa5fe473ecb1326aa0d48f51620a0ef1823245d Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sat, 13 Jul 2024 08:26:08 +0100 Subject: [PATCH 08/61] Update README.md Signed-off-by: Lamparter --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c9faa88e..f1efaecd 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,8 @@ There are multiple ways to participate in the community: ├──Emerald.App // Emerald app code and packager | ├──Emerald.App // Emerald app code (such as code related to UI but not Minecraft) | └──Emerald.App.Package // Package code for generating an uploadable MSIX bundle. -└──Emerald.Core // Emerald core code (such as code related to launching and modifying Minecraft +├──Emerald.Core // Emerald core code (such as code related to launching and modifying Minecraft +└──Emerald.CoreX // Emerald core code for the ability to run different Minecraft installation profiles and mods. ``` ### 🗃️ Contributors @@ -101,4 +102,4 @@ git clone https://github.com/RiversideValley/Emerald Copyright (c) 2022-2023 Riverside Valley Corporation -Licensed under the Nightshade Vexillum license as stated in the [LICENSE](LICENSE.md). \ No newline at end of file +Licensed under the Nightshade Vexillum license as stated in the [LICENSE](LICENSE.md). From 0d3456fcac69044ed7fafe40be90f4c0a7eb33bf Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sat, 13 Jul 2024 08:33:21 +0100 Subject: [PATCH 09/61] Update license year Signed-off-by: Lamparter --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c9faa88e..2095061e 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,6 @@ git clone https://github.com/RiversideValley/Emerald ## ⚖️ License -Copyright (c) 2022-2023 Riverside Valley Corporation +Copyright (c) 2022-2024 Riverside Valley Corporation -Licensed under the Nightshade Vexillum license as stated in the [LICENSE](LICENSE.md). \ No newline at end of file +Licensed under the Nightshade Vexillum license as stated in the [LICENSE](LICENSE.md). From 7aa85c929712ce941f8ae6f49d4df83188ea549e Mon Sep 17 00:00:00 2001 From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com> Date: Sat, 13 Jul 2024 16:49:38 +0900 Subject: [PATCH 10/61] Update Emerald.App.csproj Signed-off-by: 0x5BFA <62196528+0x5bfa@users.noreply.github.com> --- Emerald.App/Emerald.App/Emerald.App.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Emerald.App/Emerald.App/Emerald.App.csproj b/Emerald.App/Emerald.App/Emerald.App.csproj index 2fe002e1..c7306220 100644 --- a/Emerald.App/Emerald.App/Emerald.App.csproj +++ b/Emerald.App/Emerald.App/Emerald.App.csproj @@ -7,7 +7,7 @@ Emerald.WinUI app.manifest x86;x64;arm64 - win-x86;win-x64;win-arm64 + win-x86;win-x64;win-arm64 true Debug;Release enable From af8aec32d83178918db072d94c8906324ac27d02 Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 14 Jul 2024 18:38:01 +0100 Subject: [PATCH 11/61] =?UTF-8?q?=F0=9F=93=9D=20Update=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lamparter --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2095061e..48ada146 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,12 @@ Release - + Release + + Platform +


From b672c258d696112c55298039ede71ac9f074522f Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 14 Jul 2024 18:40:17 +0100 Subject: [PATCH 12/61] =?UTF-8?q?=F0=9F=93=9D=20Update=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lamparter --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 48ada146..33d42427 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,9 @@ Platform + + Platform +


From f62d9d43b5dae395a71820ee66daeb0394cfdb4b Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 14 Jul 2024 18:44:26 +0100 Subject: [PATCH 13/61] =?UTF-8?q?=F0=9F=93=9D=20Fix=20screenshot=20in=20RE?= =?UTF-8?q?ADME?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Finally! Signed-off-by: Lamparter --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 33d42427..a36c1442 100644 --- a/README.md +++ b/README.md @@ -43,9 +43,7 @@ See [this section](#-building-the-code) ### 📸 Screenshots - - Release - +[![Emerald screenshot](https://user-images.githubusercontent.com/71598437/212673147-54e79843-76aa-44ff-9db3-60b025334f07.png)](https://github.com/RiversideValley/Emerald) ## 🦜 Contributing & Feedback From 1964838676c33dbfc1103dace75df03516b7c84c Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 14 Jul 2024 18:48:57 +0100 Subject: [PATCH 14/61] =?UTF-8?q?=F0=9F=93=84=20Revise=20license?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lamparter --- LICENSE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 16dd4827..f28a54a9 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,8 +1,8 @@ **Nightshade Vexillum License** ``` -Emoji are used within this document to outwardly express conventions of easy-to-read documents, and/or help other cultures read the text at their convenience, if some words may be unclear to them. -The Emoji contained within these documents are may not wholly represent the associated meaning, and the First Party does not warrant the misunderstanding of such. +Emoji are used within this document to outwardly express conventions of easy-to-read documents, and/or help others understand the text at their convenience, if some words may be unclear to them. +The Emoji contained within these documents may not wholly convey the associated meaning, and the First Party does not warrant the misunderstanding of such. ``` ## 📖 Definitions From c609f7d69d22df4ff4a95e0cc838a7161a72589b Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 14 Jul 2024 18:53:05 +0100 Subject: [PATCH 15/61] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Remove=20spelling=20?= =?UTF-8?q?mistakes=20in=20files=20that=20reference=20'Extensions.cs'=20(#?= =?UTF-8?q?38)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Emerald.App/Emerald.App/DirectResources.cs | 2 +- .../Emerald.App/Helpers/{Extentions.cs => Extensions.cs} | 2 +- Emerald.App/Emerald.App/Views/Store/InstallerPage.xaml | 2 +- Emerald.Core/{Extentions.cs => Extensions.cs} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename Emerald.App/Emerald.App/Helpers/{Extentions.cs => Extensions.cs} (99%) rename Emerald.Core/{Extentions.cs => Extensions.cs} (86%) diff --git a/Emerald.App/Emerald.App/DirectResources.cs b/Emerald.App/Emerald.App/DirectResources.cs index 6c4bb36d..aad5c3dd 100644 --- a/Emerald.App/Emerald.App/DirectResources.cs +++ b/Emerald.App/Emerald.App/DirectResources.cs @@ -8,7 +8,7 @@ namespace Emerald.WinUI; public static class DirectResoucres { public static int MaxRAM - => Extentions.GetMemoryGB() * 1024; + => Extensions.GetMemoryGB() * 1024; public static int MinRAM => 512; diff --git a/Emerald.App/Emerald.App/Helpers/Extentions.cs b/Emerald.App/Emerald.App/Helpers/Extensions.cs similarity index 99% rename from Emerald.App/Emerald.App/Helpers/Extentions.cs rename to Emerald.App/Emerald.App/Helpers/Extensions.cs index 42278a2d..2d61c177 100644 --- a/Emerald.App/Emerald.App/Helpers/Extentions.cs +++ b/Emerald.App/Emerald.App/Helpers/Extensions.cs @@ -12,7 +12,7 @@ namespace Emerald.WinUI.Helpers { - public static class Extentions + public static class Extensions { private static readonly ConcurrentDictionary cachedResources = new(); diff --git a/Emerald.App/Emerald.App/Views/Store/InstallerPage.xaml b/Emerald.App/Emerald.App/Views/Store/InstallerPage.xaml index 587318ed..062991dc 100644 --- a/Emerald.App/Emerald.App/Views/Store/InstallerPage.xaml +++ b/Emerald.App/Emerald.App/Views/Store/InstallerPage.xaml @@ -34,7 +34,7 @@ | - Downloads + Downloads diff --git a/Emerald.Core/Extentions.cs b/Emerald.Core/Extensions.cs similarity index 86% rename from Emerald.Core/Extentions.cs rename to Emerald.Core/Extensions.cs index ebcfec9a..429795d7 100644 --- a/Emerald.Core/Extentions.cs +++ b/Emerald.Core/Extensions.cs @@ -1,6 +1,6 @@ namespace Emerald.Core { - public static class Extentions + public static class Extensions { public static string ToFullVersion(this ProjBobcat.Class.Model.Optifine.OptifineDownloadVersionModel x) => $"{x.McVersion}-Optifine_{x.Type}_{x.Patch}"; From 7c239b8685f06baff15f47dd835e37d0f12d39d6 Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 14 Jul 2024 19:09:13 +0100 Subject: [PATCH 16/61] =?UTF-8?q?=F0=9F=93=9D=20Update=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lamparter --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a36c1442..e3e19bd1 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ Release - + Release - + Platform - + Platform

From 0e0241504e7cf3baa4fe3d62618ea0ea1dbb4f1e Mon Sep 17 00:00:00 2001 From: Lamparter Date: Sun, 14 Jul 2024 21:16:27 +0100 Subject: [PATCH 17/61] =?UTF-8?q?=F0=9F=94=90=20Update=20CODEOWNERS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lamparter --- CODEOWNERS | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index cd5f9dec..e1fcfd32 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -7,10 +7,9 @@ * @RiversideValley/Emerald @NoobNotFound /Emerald.*/ @RiversideValley/Emerald Emerald.* @RiversideValley/Emerald -.editorconfig @RiversideValley/Emerald -*.md @Lamparter git@theriversi.de lamparter@theriversi.de -/.github/ @RiversideValley/Emerald -.gitattributes @RiversideValley/Emerald +*.md @Lamparter +/.github/ @Lamparter +.gitattributes @Lamparter .gitignore @RiversideValley/Emerald -.gitmodules @RiversideValley/Emerald -LICENSE.md @Lamparter git@theriversi.de lamparter@theriversi.de +.gitmodules @NoobNotFound +LICENSE.md @Lamparter From d05fb35ad3678b38060373d7dc3dcf57c8e01f83 Mon Sep 17 00:00:00 2001 From: NoobNotFound Date: Wed, 17 Jul 2024 20:48:20 +0530 Subject: [PATCH 18/61] Add fluent themed blank Uno app (maccatalyst, desktop) --- Emerald.Core/Emerald.Core.csproj | 2 +- Emerald.CoreX/Emerald.CoreX.csproj | 2 +- Emerald.Uno/.editorconfig | 167 ++++++++ Emerald.Uno/.gitignore | 403 ++++++++++++++++++ Emerald.Uno/.vscode/extensions.json | 5 + Emerald.Uno/.vscode/launch.json | 35 ++ Emerald.Uno/.vscode/settings.json | 10 + Emerald.Uno/.vscode/tasks.json | 31 ++ Emerald.Uno/.vsconfig | 18 + Emerald.Uno/Directory.Build.props | 23 + Emerald.Uno/Directory.Build.targets | 2 + Emerald.Uno/Directory.Packages.props | 9 + Emerald.Uno/Emerald.Uno.sln | 88 ++++ Emerald.Uno/Emerald.Uno/App.xaml | 19 + Emerald.Uno/Emerald.Uno/App.xaml.cs | 93 ++++ Emerald.Uno/Emerald.Uno/Assets/Icons/icon.svg | 42 ++ .../Assets/Icons/icon_foreground.svg | 137 ++++++ .../Emerald.Uno/Assets/SharedAssets.md | 32 ++ .../Assets/Splash/splash_screen.svg | 137 ++++++ Emerald.Uno/Emerald.Uno/Emerald.Uno.csproj | 32 ++ Emerald.Uno/Emerald.Uno/GlobalUsings.cs | 5 + Emerald.Uno/Emerald.Uno/MainPage.xaml | 14 + Emerald.Uno/Emerald.Uno/MainPage.xaml.cs | 9 + Emerald.Uno/Emerald.Uno/Package.appxmanifest | 43 ++ .../Emerald.Uno/Platforms/Desktop/Program.cs | 20 + .../Platforms/MacCatalyst/Entitlements.plist | 6 + .../Platforms/MacCatalyst/Info.plist | 26 ++ .../Platforms/MacCatalyst/Main.maccatalyst.cs | 14 + .../LaunchImages.launchimage/Contents.json | 58 +++ .../Properties/launchSettings.json | 22 + Emerald.Uno/Emerald.Uno/ReadMe.md | 7 + .../Emerald.Uno/Strings/en/Resources.resw | 123 ++++++ Emerald.Uno/Emerald.Uno/app.manifest | 25 ++ Emerald.Uno/global.json | 9 + 34 files changed, 1666 insertions(+), 2 deletions(-) create mode 100644 Emerald.Uno/.editorconfig create mode 100644 Emerald.Uno/.gitignore create mode 100644 Emerald.Uno/.vscode/extensions.json create mode 100644 Emerald.Uno/.vscode/launch.json create mode 100644 Emerald.Uno/.vscode/settings.json create mode 100644 Emerald.Uno/.vscode/tasks.json create mode 100644 Emerald.Uno/.vsconfig create mode 100644 Emerald.Uno/Directory.Build.props create mode 100644 Emerald.Uno/Directory.Build.targets create mode 100644 Emerald.Uno/Directory.Packages.props create mode 100644 Emerald.Uno/Emerald.Uno.sln create mode 100644 Emerald.Uno/Emerald.Uno/App.xaml create mode 100644 Emerald.Uno/Emerald.Uno/App.xaml.cs create mode 100644 Emerald.Uno/Emerald.Uno/Assets/Icons/icon.svg create mode 100644 Emerald.Uno/Emerald.Uno/Assets/Icons/icon_foreground.svg create mode 100644 Emerald.Uno/Emerald.Uno/Assets/SharedAssets.md create mode 100644 Emerald.Uno/Emerald.Uno/Assets/Splash/splash_screen.svg create mode 100644 Emerald.Uno/Emerald.Uno/Emerald.Uno.csproj create mode 100644 Emerald.Uno/Emerald.Uno/GlobalUsings.cs create mode 100644 Emerald.Uno/Emerald.Uno/MainPage.xaml create mode 100644 Emerald.Uno/Emerald.Uno/MainPage.xaml.cs create mode 100644 Emerald.Uno/Emerald.Uno/Package.appxmanifest create mode 100644 Emerald.Uno/Emerald.Uno/Platforms/Desktop/Program.cs create mode 100644 Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Entitlements.plist create mode 100644 Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Info.plist create mode 100644 Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Main.maccatalyst.cs create mode 100644 Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json create mode 100644 Emerald.Uno/Emerald.Uno/Properties/launchSettings.json create mode 100644 Emerald.Uno/Emerald.Uno/ReadMe.md create mode 100644 Emerald.Uno/Emerald.Uno/Strings/en/Resources.resw create mode 100644 Emerald.Uno/Emerald.Uno/app.manifest create mode 100644 Emerald.Uno/global.json diff --git a/Emerald.Core/Emerald.Core.csproj b/Emerald.Core/Emerald.Core.csproj index 83657dd3..d143325d 100644 --- a/Emerald.Core/Emerald.Core.csproj +++ b/Emerald.Core/Emerald.Core.csproj @@ -12,4 +12,4 @@ - + \ No newline at end of file diff --git a/Emerald.CoreX/Emerald.CoreX.csproj b/Emerald.CoreX/Emerald.CoreX.csproj index ed9e2beb..367cd3d7 100644 --- a/Emerald.CoreX/Emerald.CoreX.csproj +++ b/Emerald.CoreX/Emerald.CoreX.csproj @@ -12,4 +12,4 @@ - + \ No newline at end of file diff --git a/Emerald.Uno/.editorconfig b/Emerald.Uno/.editorconfig new file mode 100644 index 00000000..b947be64 --- /dev/null +++ b/Emerald.Uno/.editorconfig @@ -0,0 +1,167 @@ +; This file is for unifying the coding style for different editors and IDEs. +; More information at http://editorconfig.org + +# This file is the top-most EditorConfig file +root = true + +########################################## +# Common Settings +########################################## + +[*] +indent_style = space +end_of_line = crlf +trim_trailing_whitespace = true +insert_final_newline = true +charset = utf-8 + +########################################## +# File Extension Settings +########################################## + +[*.{yml,yaml}] +indent_size = 2 + +[.vsconfig] +indent_size = 2 +end_of_line = lf + +[*.sln] +indent_style = tab +indent_size = 2 + +[*.{csproj,proj,projitems,shproj}] +indent_size = 2 + +[*.{json,slnf}] +indent_size = 2 +end_of_line = lf + +[*.{props,targets}] +indent_size = 2 + +[*.xaml] +indent_size = 2 +charset = utf-8-bom + +[*.xml] +indent_size = 2 +end_of_line = lf + +[*.plist] +indent_size = 2 +indent_style = tab +end_of_line = lf + +[*.manifest] +indent_size = 2 + +[*.appxmanifest] +indent_size = 2 + +[*.{json,css,webmanifest}] +indent_size = 2 +end_of_line = lf + +[web.config] +indent_size = 2 +end_of_line = lf + +[*.sh] +indent_size = 2 +end_of_line = lf + +[*.cs] +# EOL should be normalized by Git. See https://github.com/dotnet/format/issues/1099 +end_of_line = unset + +# See https://github.com/dotnet/roslyn/issues/20356#issuecomment-310143926 +trim_trailing_whitespace = false + +tab_width = 4 +indent_size = 4 + +# Sort using and Import directives with System.* appearing first +dotnet_sort_system_directives_first = true + +# Avoid "this." and "Me." if not necessary +dotnet_style_qualification_for_field = false:suggestion +dotnet_style_qualification_for_property = false:suggestion +dotnet_style_qualification_for_method = false:suggestion +dotnet_style_qualification_for_event = false:suggestion + +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Naming styles + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_null_propagation = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion +dotnet_style_prefer_auto_properties = true:silent +dotnet_style_object_initializer = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_prefer_simplified_boolean_expressions = true:suggestion +dotnet_style_prefer_conditional_expression_over_assignment = true:silent +dotnet_style_prefer_conditional_expression_over_return = true:silent +dotnet_style_explicit_tuple_names = true:suggestion +dotnet_style_prefer_inferred_tuple_names = true:suggestion + +csharp_indent_labels = one_less_than_current +csharp_using_directive_placement = outside_namespace:silent +csharp_prefer_simple_using_statement = true:suggestion +csharp_prefer_braces = true:silent +csharp_style_namespace_declarations = file_scoped:warning +csharp_style_prefer_method_group_conversion = true:silent +csharp_style_prefer_top_level_statements = true:silent +csharp_style_prefer_primary_constructors = true:suggestion +csharp_style_expression_bodied_methods = false:silent +csharp_style_expression_bodied_constructors = false:silent +csharp_style_expression_bodied_operators = false:silent +csharp_style_expression_bodied_properties = true:silent +csharp_style_expression_bodied_indexers = true:silent +csharp_style_expression_bodied_accessors = true:silent +csharp_style_expression_bodied_lambdas = true:silent +csharp_style_expression_bodied_local_functions = false:silent diff --git a/Emerald.Uno/.gitignore b/Emerald.Uno/.gitignore new file mode 100644 index 00000000..ef88c205 --- /dev/null +++ b/Emerald.Uno/.gitignore @@ -0,0 +1,403 @@ +## 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/main/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/ + +# 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 +*.tlog +*.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 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# 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/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# 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 + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml + +# Single Target Config +solution-config.props +# Publish Profiles +!**/Properties/PublishProfiles/*.pubxml \ No newline at end of file diff --git a/Emerald.Uno/.vscode/extensions.json b/Emerald.Uno/.vscode/extensions.json new file mode 100644 index 00000000..a63ad400 --- /dev/null +++ b/Emerald.Uno/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "unoplatform.vscode" + ], +} diff --git a/Emerald.Uno/.vscode/launch.json b/Emerald.Uno/.vscode/launch.json new file mode 100644 index 00000000..6edf6c2e --- /dev/null +++ b/Emerald.Uno/.vscode/launch.json @@ -0,0 +1,35 @@ +{ + // Use IntelliSense to find out which attributes exist for C# debugging + // Use hover for the description of the existing attributes + // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md + "version": "0.2.0", + "configurations": [ + { + "name": "Uno Platform Mobile", + "type": "Uno", + "request": "launch", + // any Uno* task will do, this is simply to satisfy vscode requirement when a launch.json is present + "preLaunchTask": "Uno: android | Debug | android-x64" + }, + { + // Use IntelliSense to find out which attributes exist for C# debugging + // Use hover for the description of the existing attributes + // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md + "name": "Uno Platform Desktop (Debug)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build-desktop", + // If you have changed target frameworks, make sure to update the program path. + "program": "${workspaceFolder}/Emerald.Uno/bin/Debug/net8.0-desktop/Emerald.Uno.dll", + "args": [], + "launchSettingsProfile": "Emerald.Uno (Desktop)", + "env": { + "DOTNET_MODIFIABLE_ASSEMBLIES": "debug" + }, + "cwd": "${workspaceFolder}/Emerald.Uno", + // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console + "console": "internalConsole", + "stopAtEntry": false + }, + ] +} diff --git a/Emerald.Uno/.vscode/settings.json b/Emerald.Uno/.vscode/settings.json new file mode 100644 index 00000000..3405922d --- /dev/null +++ b/Emerald.Uno/.vscode/settings.json @@ -0,0 +1,10 @@ +{ + "explorer.fileNesting.enabled": true, + "explorer.fileNesting.expand": false, + "explorer.fileNesting.patterns": { + "*.xaml": "$(capture).xaml.cs" + }, + "files.associations": { + "global.json": "jsonc" + } +} diff --git a/Emerald.Uno/.vscode/tasks.json b/Emerald.Uno/.vscode/tasks.json new file mode 100644 index 00000000..d1233194 --- /dev/null +++ b/Emerald.Uno/.vscode/tasks.json @@ -0,0 +1,31 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build-desktop", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/Emerald.Uno/Emerald.Uno.csproj", + "/property:GenerateFullPaths=true", + "/property:TargetFramework=net8.0-desktop", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish-desktop", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/Emerald.Uno/Emerald.Uno.csproj", + "/property:GenerateFullPaths=true", + "/property:TargetFramework=net8.0-desktop", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + } + ] +} diff --git a/Emerald.Uno/.vsconfig b/Emerald.Uno/.vsconfig new file mode 100644 index 00000000..14e219a9 --- /dev/null +++ b/Emerald.Uno/.vsconfig @@ -0,0 +1,18 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Component.CoreEditor", + "Microsoft.VisualStudio.Workload.CoreEditor", + "Microsoft.NetCore.Component.SDK", + "Microsoft.NetCore.Component.DevelopmentTools", + "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites", + "Microsoft.VisualStudio.Component.TextTemplating", + "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites", + "Microsoft.VisualStudio.Component.Debugger.JustInTime", + "Microsoft.VisualStudio.Workload.ManagedDesktop", + "Microsoft.VisualStudio.Component.MonoDebugger", + "Microsoft.VisualStudio.ComponentGroup.Maui.All", + "Microsoft.VisualStudio.Workload.NetCrossPlat", + "Microsoft.VisualStudio.Workload.NetCoreTools" + ] +} diff --git a/Emerald.Uno/Directory.Build.props b/Emerald.Uno/Directory.Build.props new file mode 100644 index 00000000..2bd4f977 --- /dev/null +++ b/Emerald.Uno/Directory.Build.props @@ -0,0 +1,23 @@ + + + enable + enable + true + + + $(NoWarn);NU1507;NETSDK1201;PRI257 + + + + + 4.1.23 + 6.0.18 + 5.0.13 + 5.2.14 + + diff --git a/Emerald.Uno/Directory.Build.targets b/Emerald.Uno/Directory.Build.targets new file mode 100644 index 00000000..f75adf7e --- /dev/null +++ b/Emerald.Uno/Directory.Build.targets @@ -0,0 +1,2 @@ + + diff --git a/Emerald.Uno/Directory.Packages.props b/Emerald.Uno/Directory.Packages.props new file mode 100644 index 00000000..0cea764d --- /dev/null +++ b/Emerald.Uno/Directory.Packages.props @@ -0,0 +1,9 @@ + + + + + diff --git a/Emerald.Uno/Emerald.Uno.sln b/Emerald.Uno/Emerald.Uno.sln new file mode 100644 index 00000000..2b517401 --- /dev/null +++ b/Emerald.Uno/Emerald.Uno.sln @@ -0,0 +1,88 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32210.308 +MinimumVisualStudioVersion = 15.0.26124.0 + +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emerald.Uno", "Emerald.Uno\Emerald.Uno.csproj", "{56590F45-D858-45B0-AD87-84D23799BF2D}" +EndProject + +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BADA71DC-7FFD-4EDC-9F28-FB74AEADC713}" + ProjectSection(SolutionItems) = preProject + .gitignore = .gitignore + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + global.json = global.json + Directory.Packages.props = Directory.Packages.props + .vsconfig = .vsconfig + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 + Debug|iPhone = Debug|iPhone + Debug|iPhoneSimulator = Debug|iPhoneSimulator + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 + Release|iPhone = Release|iPhone + Release|iPhoneSimulator = Release|iPhoneSimulator + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|ARM.ActiveCfg = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|ARM.Build.0 = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|ARM.Deploy.0 = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|ARM64.Build.0 = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|ARM64.Deploy.0 = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|iPhone.Build.0 = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|iPhone.Deploy.0 = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|x64.ActiveCfg = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|x64.Build.0 = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|x64.Deploy.0 = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|x86.ActiveCfg = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|x86.Build.0 = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|x86.Deploy.0 = Debug|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|Any CPU.Build.0 = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|Any CPU.Deploy.0 = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|ARM.ActiveCfg = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|ARM.Build.0 = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|ARM.Deploy.0 = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|ARM64.ActiveCfg = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|ARM64.Build.0 = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|ARM64.Deploy.0 = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|iPhone.ActiveCfg = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|iPhone.Build.0 = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|iPhone.Deploy.0 = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|x64.ActiveCfg = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|x64.Build.0 = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|x64.Deploy.0 = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|x86.ActiveCfg = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|x86.Build.0 = Release|Any CPU + {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|x86.Deploy.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {AB135C24-13F4-4748-B054-A09A7EDEAF5D} + EndGlobalSection +EndGlobal diff --git a/Emerald.Uno/Emerald.Uno/App.xaml b/Emerald.Uno/Emerald.Uno/App.xaml new file mode 100644 index 00000000..c099af18 --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/App.xaml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + diff --git a/Emerald.Uno/Emerald.Uno/App.xaml.cs b/Emerald.Uno/Emerald.Uno/App.xaml.cs new file mode 100644 index 00000000..af8abac3 --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/App.xaml.cs @@ -0,0 +1,93 @@ +using Uno.Resizetizer; + +namespace Emerald.Uno; + +public partial class App : Application +{ + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + public App() + { + this.InitializeComponent(); + } + + protected Window? MainWindow { get; private set; } + protected IHost? Host { get; private set; } + + protected override void OnLaunched(LaunchActivatedEventArgs args) + { + var builder = this.CreateBuilder(args) + .Configure(host => host +#if DEBUG + // Switch to Development environment when running in DEBUG + .UseEnvironment(Environments.Development) +#endif + .UseLogging(configure: (context, logBuilder) => + { + // Configure log levels for different categories of logging + logBuilder + .SetMinimumLevel( + context.HostingEnvironment.IsDevelopment() ? + LogLevel.Information : + LogLevel.Warning) + + // Default filters for core Uno Platform namespaces + .CoreLogLevel(LogLevel.Warning); + + // Uno Platform namespace filter groups + // Uncomment individual methods to see more detailed logging + //// Generic Xaml events + //logBuilder.XamlLogLevel(LogLevel.Debug); + //// Layout specific messages + //logBuilder.XamlLayoutLogLevel(LogLevel.Debug); + //// Storage messages + //logBuilder.StorageLogLevel(LogLevel.Debug); + //// Binding related messages + //logBuilder.XamlBindingLogLevel(LogLevel.Debug); + //// Binder memory references tracking + //logBuilder.BinderMemoryReferenceLogLevel(LogLevel.Debug); + //// DevServer and HotReload related + //logBuilder.HotReloadCoreLogLevel(LogLevel.Information); + //// Debug JS interop + //logBuilder.WebAssemblyLogLevel(LogLevel.Debug); + + }, enableUnoLogging: true) + .ConfigureServices((context, services) => + { + // TODO: Register your services + //services.AddSingleton(); + }) + ); + MainWindow = builder.Window; + +#if DEBUG + MainWindow.EnableHotReload(); +#endif + MainWindow.SetWindowIcon(); + + Host = builder.Build(); + + // Do not repeat app initialization when the Window already has content, + // just ensure that the window is active + if (MainWindow.Content is not Frame rootFrame) + { + // Create a Frame to act as the navigation context and navigate to the first page + rootFrame = new Frame(); + + // Place the frame in the current Window + MainWindow.Content = rootFrame; + } + + if (rootFrame.Content == null) + { + // When the navigation stack isn't restored navigate to the first page, + // configuring the new page by passing required information as a navigation + // parameter + rootFrame.Navigate(typeof(MainPage), args.Arguments); + } + // Ensure the current window is active + MainWindow.Activate(); + } +} diff --git a/Emerald.Uno/Emerald.Uno/Assets/Icons/icon.svg b/Emerald.Uno/Emerald.Uno/Assets/Icons/icon.svg new file mode 100644 index 00000000..a15af53a --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/Assets/Icons/icon.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/Emerald.Uno/Emerald.Uno/Assets/Icons/icon_foreground.svg b/Emerald.Uno/Emerald.Uno/Assets/Icons/icon_foreground.svg new file mode 100644 index 00000000..8ffc41ae --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/Assets/Icons/icon_foreground.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Emerald.Uno/Emerald.Uno/Assets/SharedAssets.md b/Emerald.Uno/Emerald.Uno/Assets/SharedAssets.md new file mode 100644 index 00000000..1b84a74a --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/Assets/SharedAssets.md @@ -0,0 +1,32 @@ +# Shared Assets + +See documentation about assets here: https://github.com/unoplatform/uno/blob/master/doc/articles/features/working-with-assets.md + +## Here is a cheat sheet + +1. Add the image file to the `Assets` directory of a shared project. +2. Set the build action to `Content`. +3. (Recommended) Provide an asset for various scales/dpi + +### Examples + +```text +\Assets\Images\logo.scale-100.png +\Assets\Images\logo.scale-200.png +\Assets\Images\logo.scale-400.png + +\Assets\Images\scale-100\logo.png +\Assets\Images\scale-200\logo.png +\Assets\Images\scale-400\logo.png +``` + +### Table of scales + +| Scale | WinUI | iOS/MacCatalyst | Android | +|-------|:-----------:|:---------------:|:-------:| +| `100` | scale-100 | @1x | mdpi | +| `125` | scale-125 | N/A | N/A | +| `150` | scale-150 | N/A | hdpi | +| `200` | scale-200 | @2x | xhdpi | +| `300` | scale-300 | @3x | xxhdpi | +| `400` | scale-400 | N/A | xxxhdpi | diff --git a/Emerald.Uno/Emerald.Uno/Assets/Splash/splash_screen.svg b/Emerald.Uno/Emerald.Uno/Assets/Splash/splash_screen.svg new file mode 100644 index 00000000..8ffc41ae --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/Assets/Splash/splash_screen.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Emerald.Uno/Emerald.Uno/Emerald.Uno.csproj b/Emerald.Uno/Emerald.Uno/Emerald.Uno.csproj new file mode 100644 index 00000000..5fc9bc3f --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/Emerald.Uno.csproj @@ -0,0 +1,32 @@ + + + + net8.0-maccatalyst; + net8.0-desktop; + + + Exe + true + + + Emerald.Uno + + com.Riverside.Emerald.Uno + + 1.0 + 1 + + + + Lottie; + Hosting; + Toolkit; + Logging; + ThemeService; + + + + diff --git a/Emerald.Uno/Emerald.Uno/GlobalUsings.cs b/Emerald.Uno/Emerald.Uno/GlobalUsings.cs new file mode 100644 index 00000000..2f101745 --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/GlobalUsings.cs @@ -0,0 +1,5 @@ +global using System.Collections.Immutable; +global using Microsoft.Extensions.DependencyInjection; +global using Microsoft.Extensions.Hosting; +global using Microsoft.Extensions.Logging; +global using ApplicationExecutionState = Windows.ApplicationModel.Activation.ApplicationExecutionState; diff --git a/Emerald.Uno/Emerald.Uno/MainPage.xaml b/Emerald.Uno/Emerald.Uno/MainPage.xaml new file mode 100644 index 00000000..fabe71b5 --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/MainPage.xaml @@ -0,0 +1,14 @@ + + + + + diff --git a/Emerald.Uno/Emerald.Uno/MainPage.xaml.cs b/Emerald.Uno/Emerald.Uno/MainPage.xaml.cs new file mode 100644 index 00000000..7221ba67 --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/MainPage.xaml.cs @@ -0,0 +1,9 @@ +namespace Emerald.Uno; + +public sealed partial class MainPage : Page +{ + public MainPage() + { + this.InitializeComponent(); + } +} diff --git a/Emerald.Uno/Emerald.Uno/Package.appxmanifest b/Emerald.Uno/Emerald.Uno/Package.appxmanifest new file mode 100644 index 00000000..4a56eba6 --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/Package.appxmanifest @@ -0,0 +1,43 @@ + + + + + + + + Emerald.Uno + Emerald.Uno + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Emerald.Uno/Emerald.Uno/Platforms/Desktop/Program.cs b/Emerald.Uno/Emerald.Uno/Platforms/Desktop/Program.cs new file mode 100644 index 00000000..fa9a1876 --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/Platforms/Desktop/Program.cs @@ -0,0 +1,20 @@ +using Uno.UI.Runtime.Skia; + +namespace Emerald.Uno; + +public class Program +{ + [STAThread] + public static void Main(string[] args) + { + var host = SkiaHostBuilder.Create() + .App(() => new App()) + .UseX11() + .UseLinuxFrameBuffer() + .UseMacOS() + .UseWindows() + .Build(); + + host.Run(); + } +} diff --git a/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Entitlements.plist b/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Entitlements.plist new file mode 100644 index 00000000..24c31036 --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Entitlements.plist @@ -0,0 +1,6 @@ + + + + + + diff --git a/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Info.plist b/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Info.plist new file mode 100644 index 00000000..1bb02ddc --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Info.plist @@ -0,0 +1,26 @@ + + + + + UIDeviceFamily + + 2 + + LSApplicationCategoryType + public.app-category.utilities + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + XSAppIconAssets + Assets.xcassets/icon.appiconset + + + + diff --git a/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Main.maccatalyst.cs b/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Main.maccatalyst.cs new file mode 100644 index 00000000..123635ea --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Main.maccatalyst.cs @@ -0,0 +1,14 @@ +using UIKit; + +namespace Emerald.Uno.MacCatalyst; + +public class EntryPoint +{ + // This is the main entry point of the application. + public static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(App)); + } +} diff --git a/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json b/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json new file mode 100644 index 00000000..69555e44 --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json @@ -0,0 +1,58 @@ +{ + "images": [ + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "640x960", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "subtype": "retina4", + "scale": "2x", + "size": "640x1136", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "768x1024", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "1024x768", + "idiom": "ipad" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "1536x2048", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "2048x1536", + "idiom": "ipad" + } + ], + "properties": {}, + "info": { + "version": 1, + "author": "" + } +} \ No newline at end of file diff --git a/Emerald.Uno/Emerald.Uno/Properties/launchSettings.json b/Emerald.Uno/Emerald.Uno/Properties/launchSettings.json new file mode 100644 index 00000000..3b3d93a5 --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/Properties/launchSettings.json @@ -0,0 +1,22 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:8080", + "sslPort": 0 + } + }, + "profiles": { + "Emerald.Uno (Desktop)": { + "commandName": "Project", + "compatibleTargetFramework": "desktop" + }, + "Emerald.Uno (Desktop WSL2)": { + "commandName": "WSL2", + "commandLineArgs": "{ProjectDir}/bin/Debug/net8.0-desktop/Emerald.Uno.dll", + "distributionName": "", + "compatibleTargetFramework": "desktop" + } + } +} diff --git a/Emerald.Uno/Emerald.Uno/ReadMe.md b/Emerald.Uno/Emerald.Uno/ReadMe.md new file mode 100644 index 00000000..93482da2 --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/ReadMe.md @@ -0,0 +1,7 @@ +# Getting Started + +Welcome to the Uno Platform! + +To discover how to get started with your new app: https://aka.platform.uno/get-started + +For more information on how to use the Uno.Sdk or upgrade Uno Platform packages in your solution: https://aka.platform.uno/using-uno-sdk \ No newline at end of file diff --git a/Emerald.Uno/Emerald.Uno/Strings/en/Resources.resw b/Emerald.Uno/Emerald.Uno/Strings/en/Resources.resw new file mode 100644 index 00000000..2723b3c3 --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/Strings/en/Resources.resw @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Emerald.Uno-en + + diff --git a/Emerald.Uno/Emerald.Uno/app.manifest b/Emerald.Uno/Emerald.Uno/app.manifest new file mode 100644 index 00000000..a61e665f --- /dev/null +++ b/Emerald.Uno/Emerald.Uno/app.manifest @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + true/PM + PerMonitorV2, PerMonitor + + + diff --git a/Emerald.Uno/global.json b/Emerald.Uno/global.json new file mode 100644 index 00000000..ce7228cb --- /dev/null +++ b/Emerald.Uno/global.json @@ -0,0 +1,9 @@ +{ + // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information. + "msbuild-sdks": { + "Uno.Sdk": "5.2.175" + }, + "sdk": { + "allowPrerelease": false + } +} From 0642c5a67c69cf11b4df1e46fda306a7cfed0b26 Mon Sep 17 00:00:00 2001 From: Lamparter Date: Thu, 18 Jul 2024 17:15:42 +0100 Subject: [PATCH 19/61] Remove Uno Platform project I didn't really like it anyway --- Emerald.Uno/.editorconfig | 167 -------- Emerald.Uno/.gitignore | 403 ------------------ Emerald.Uno/.vscode/extensions.json | 5 - Emerald.Uno/.vscode/launch.json | 35 -- Emerald.Uno/.vscode/settings.json | 10 - Emerald.Uno/.vscode/tasks.json | 31 -- Emerald.Uno/.vsconfig | 18 - Emerald.Uno/Directory.Build.props | 23 - Emerald.Uno/Directory.Build.targets | 2 - Emerald.Uno/Directory.Packages.props | 9 - Emerald.Uno/Emerald.Uno.sln | 88 ---- Emerald.Uno/Emerald.Uno/App.xaml | 19 - Emerald.Uno/Emerald.Uno/App.xaml.cs | 93 ---- Emerald.Uno/Emerald.Uno/Assets/Icons/icon.svg | 42 -- .../Assets/Icons/icon_foreground.svg | 137 ------ .../Emerald.Uno/Assets/SharedAssets.md | 32 -- .../Assets/Splash/splash_screen.svg | 137 ------ Emerald.Uno/Emerald.Uno/Emerald.Uno.csproj | 32 -- Emerald.Uno/Emerald.Uno/GlobalUsings.cs | 5 - Emerald.Uno/Emerald.Uno/MainPage.xaml | 14 - Emerald.Uno/Emerald.Uno/MainPage.xaml.cs | 9 - Emerald.Uno/Emerald.Uno/Package.appxmanifest | 43 -- .../Emerald.Uno/Platforms/Desktop/Program.cs | 20 - .../Platforms/MacCatalyst/Entitlements.plist | 6 - .../Platforms/MacCatalyst/Info.plist | 26 -- .../Platforms/MacCatalyst/Main.maccatalyst.cs | 14 - .../LaunchImages.launchimage/Contents.json | 58 --- .../Properties/launchSettings.json | 22 - Emerald.Uno/Emerald.Uno/ReadMe.md | 7 - .../Emerald.Uno/Strings/en/Resources.resw | 123 ------ Emerald.Uno/Emerald.Uno/app.manifest | 25 -- Emerald.Uno/global.json | 9 - 32 files changed, 1664 deletions(-) delete mode 100644 Emerald.Uno/.editorconfig delete mode 100644 Emerald.Uno/.gitignore delete mode 100644 Emerald.Uno/.vscode/extensions.json delete mode 100644 Emerald.Uno/.vscode/launch.json delete mode 100644 Emerald.Uno/.vscode/settings.json delete mode 100644 Emerald.Uno/.vscode/tasks.json delete mode 100644 Emerald.Uno/.vsconfig delete mode 100644 Emerald.Uno/Directory.Build.props delete mode 100644 Emerald.Uno/Directory.Build.targets delete mode 100644 Emerald.Uno/Directory.Packages.props delete mode 100644 Emerald.Uno/Emerald.Uno.sln delete mode 100644 Emerald.Uno/Emerald.Uno/App.xaml delete mode 100644 Emerald.Uno/Emerald.Uno/App.xaml.cs delete mode 100644 Emerald.Uno/Emerald.Uno/Assets/Icons/icon.svg delete mode 100644 Emerald.Uno/Emerald.Uno/Assets/Icons/icon_foreground.svg delete mode 100644 Emerald.Uno/Emerald.Uno/Assets/SharedAssets.md delete mode 100644 Emerald.Uno/Emerald.Uno/Assets/Splash/splash_screen.svg delete mode 100644 Emerald.Uno/Emerald.Uno/Emerald.Uno.csproj delete mode 100644 Emerald.Uno/Emerald.Uno/GlobalUsings.cs delete mode 100644 Emerald.Uno/Emerald.Uno/MainPage.xaml delete mode 100644 Emerald.Uno/Emerald.Uno/MainPage.xaml.cs delete mode 100644 Emerald.Uno/Emerald.Uno/Package.appxmanifest delete mode 100644 Emerald.Uno/Emerald.Uno/Platforms/Desktop/Program.cs delete mode 100644 Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Entitlements.plist delete mode 100644 Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Info.plist delete mode 100644 Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Main.maccatalyst.cs delete mode 100644 Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json delete mode 100644 Emerald.Uno/Emerald.Uno/Properties/launchSettings.json delete mode 100644 Emerald.Uno/Emerald.Uno/ReadMe.md delete mode 100644 Emerald.Uno/Emerald.Uno/Strings/en/Resources.resw delete mode 100644 Emerald.Uno/Emerald.Uno/app.manifest delete mode 100644 Emerald.Uno/global.json diff --git a/Emerald.Uno/.editorconfig b/Emerald.Uno/.editorconfig deleted file mode 100644 index b947be64..00000000 --- a/Emerald.Uno/.editorconfig +++ /dev/null @@ -1,167 +0,0 @@ -; This file is for unifying the coding style for different editors and IDEs. -; More information at http://editorconfig.org - -# This file is the top-most EditorConfig file -root = true - -########################################## -# Common Settings -########################################## - -[*] -indent_style = space -end_of_line = crlf -trim_trailing_whitespace = true -insert_final_newline = true -charset = utf-8 - -########################################## -# File Extension Settings -########################################## - -[*.{yml,yaml}] -indent_size = 2 - -[.vsconfig] -indent_size = 2 -end_of_line = lf - -[*.sln] -indent_style = tab -indent_size = 2 - -[*.{csproj,proj,projitems,shproj}] -indent_size = 2 - -[*.{json,slnf}] -indent_size = 2 -end_of_line = lf - -[*.{props,targets}] -indent_size = 2 - -[*.xaml] -indent_size = 2 -charset = utf-8-bom - -[*.xml] -indent_size = 2 -end_of_line = lf - -[*.plist] -indent_size = 2 -indent_style = tab -end_of_line = lf - -[*.manifest] -indent_size = 2 - -[*.appxmanifest] -indent_size = 2 - -[*.{json,css,webmanifest}] -indent_size = 2 -end_of_line = lf - -[web.config] -indent_size = 2 -end_of_line = lf - -[*.sh] -indent_size = 2 -end_of_line = lf - -[*.cs] -# EOL should be normalized by Git. See https://github.com/dotnet/format/issues/1099 -end_of_line = unset - -# See https://github.com/dotnet/roslyn/issues/20356#issuecomment-310143926 -trim_trailing_whitespace = false - -tab_width = 4 -indent_size = 4 - -# Sort using and Import directives with System.* appearing first -dotnet_sort_system_directives_first = true - -# Avoid "this." and "Me." if not necessary -dotnet_style_qualification_for_field = false:suggestion -dotnet_style_qualification_for_property = false:suggestion -dotnet_style_qualification_for_method = false:suggestion -dotnet_style_qualification_for_event = false:suggestion - -#### Naming styles #### - -# Naming rules - -dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion -dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface -dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i - -dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion -dotnet_naming_rule.types_should_be_pascal_case.symbols = types -dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion -dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members -dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case - -# Symbol specifications - -dotnet_naming_symbols.interface.applicable_kinds = interface -dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.interface.required_modifiers = - -dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum -dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.types.required_modifiers = - -dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method -dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.non_field_members.required_modifiers = - -# Naming styles - -dotnet_naming_style.begins_with_i.required_prefix = I -dotnet_naming_style.begins_with_i.required_suffix = -dotnet_naming_style.begins_with_i.word_separator = -dotnet_naming_style.begins_with_i.capitalization = pascal_case - -dotnet_naming_style.pascal_case.required_prefix = -dotnet_naming_style.pascal_case.required_suffix = -dotnet_naming_style.pascal_case.word_separator = -dotnet_naming_style.pascal_case.capitalization = pascal_case - -dotnet_naming_style.pascal_case.required_prefix = -dotnet_naming_style.pascal_case.required_suffix = -dotnet_naming_style.pascal_case.word_separator = -dotnet_naming_style.pascal_case.capitalization = pascal_case -dotnet_style_operator_placement_when_wrapping = beginning_of_line -dotnet_style_coalesce_expression = true:suggestion -dotnet_style_null_propagation = true:suggestion -dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion -dotnet_style_prefer_auto_properties = true:silent -dotnet_style_object_initializer = true:suggestion -dotnet_style_collection_initializer = true:suggestion -dotnet_style_prefer_simplified_boolean_expressions = true:suggestion -dotnet_style_prefer_conditional_expression_over_assignment = true:silent -dotnet_style_prefer_conditional_expression_over_return = true:silent -dotnet_style_explicit_tuple_names = true:suggestion -dotnet_style_prefer_inferred_tuple_names = true:suggestion - -csharp_indent_labels = one_less_than_current -csharp_using_directive_placement = outside_namespace:silent -csharp_prefer_simple_using_statement = true:suggestion -csharp_prefer_braces = true:silent -csharp_style_namespace_declarations = file_scoped:warning -csharp_style_prefer_method_group_conversion = true:silent -csharp_style_prefer_top_level_statements = true:silent -csharp_style_prefer_primary_constructors = true:suggestion -csharp_style_expression_bodied_methods = false:silent -csharp_style_expression_bodied_constructors = false:silent -csharp_style_expression_bodied_operators = false:silent -csharp_style_expression_bodied_properties = true:silent -csharp_style_expression_bodied_indexers = true:silent -csharp_style_expression_bodied_accessors = true:silent -csharp_style_expression_bodied_lambdas = true:silent -csharp_style_expression_bodied_local_functions = false:silent diff --git a/Emerald.Uno/.gitignore b/Emerald.Uno/.gitignore deleted file mode 100644 index ef88c205..00000000 --- a/Emerald.Uno/.gitignore +++ /dev/null @@ -1,403 +0,0 @@ -## 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/main/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/ - -# 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 -*.tlog -*.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 6 auto-generated project file (contains which files were open etc.) -*.vbp - -# Visual Studio 6 workspace and project file (working project files containing files to include in project) -*.dsw -*.dsp - -# Visual Studio 6 technical files -*.ncb -*.aps - -# 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/ - -# Visual Studio History (VSHistory) files -.vshistory/ - -# 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 - -# VS Code files for those working on multiple tools -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -*.code-workspace - -# Local History for Visual Studio Code -.history/ - -# Windows Installer files from build outputs -*.cab -*.msi -*.msix -*.msm -*.msp - -# JetBrains Rider -*.sln.iml - -# Single Target Config -solution-config.props -# Publish Profiles -!**/Properties/PublishProfiles/*.pubxml \ No newline at end of file diff --git a/Emerald.Uno/.vscode/extensions.json b/Emerald.Uno/.vscode/extensions.json deleted file mode 100644 index a63ad400..00000000 --- a/Emerald.Uno/.vscode/extensions.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "recommendations": [ - "unoplatform.vscode" - ], -} diff --git a/Emerald.Uno/.vscode/launch.json b/Emerald.Uno/.vscode/launch.json deleted file mode 100644 index 6edf6c2e..00000000 --- a/Emerald.Uno/.vscode/launch.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - // Use IntelliSense to find out which attributes exist for C# debugging - // Use hover for the description of the existing attributes - // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md - "version": "0.2.0", - "configurations": [ - { - "name": "Uno Platform Mobile", - "type": "Uno", - "request": "launch", - // any Uno* task will do, this is simply to satisfy vscode requirement when a launch.json is present - "preLaunchTask": "Uno: android | Debug | android-x64" - }, - { - // Use IntelliSense to find out which attributes exist for C# debugging - // Use hover for the description of the existing attributes - // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md - "name": "Uno Platform Desktop (Debug)", - "type": "coreclr", - "request": "launch", - "preLaunchTask": "build-desktop", - // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/Emerald.Uno/bin/Debug/net8.0-desktop/Emerald.Uno.dll", - "args": [], - "launchSettingsProfile": "Emerald.Uno (Desktop)", - "env": { - "DOTNET_MODIFIABLE_ASSEMBLIES": "debug" - }, - "cwd": "${workspaceFolder}/Emerald.Uno", - // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console - "console": "internalConsole", - "stopAtEntry": false - }, - ] -} diff --git a/Emerald.Uno/.vscode/settings.json b/Emerald.Uno/.vscode/settings.json deleted file mode 100644 index 3405922d..00000000 --- a/Emerald.Uno/.vscode/settings.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "explorer.fileNesting.enabled": true, - "explorer.fileNesting.expand": false, - "explorer.fileNesting.patterns": { - "*.xaml": "$(capture).xaml.cs" - }, - "files.associations": { - "global.json": "jsonc" - } -} diff --git a/Emerald.Uno/.vscode/tasks.json b/Emerald.Uno/.vscode/tasks.json deleted file mode 100644 index d1233194..00000000 --- a/Emerald.Uno/.vscode/tasks.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "label": "build-desktop", - "command": "dotnet", - "type": "process", - "args": [ - "build", - "${workspaceFolder}/Emerald.Uno/Emerald.Uno.csproj", - "/property:GenerateFullPaths=true", - "/property:TargetFramework=net8.0-desktop", - "/consoleloggerparameters:NoSummary" - ], - "problemMatcher": "$msCompile" - }, - { - "label": "publish-desktop", - "command": "dotnet", - "type": "process", - "args": [ - "publish", - "${workspaceFolder}/Emerald.Uno/Emerald.Uno.csproj", - "/property:GenerateFullPaths=true", - "/property:TargetFramework=net8.0-desktop", - "/consoleloggerparameters:NoSummary" - ], - "problemMatcher": "$msCompile" - } - ] -} diff --git a/Emerald.Uno/.vsconfig b/Emerald.Uno/.vsconfig deleted file mode 100644 index 14e219a9..00000000 --- a/Emerald.Uno/.vsconfig +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": "1.0", - "components": [ - "Microsoft.VisualStudio.Component.CoreEditor", - "Microsoft.VisualStudio.Workload.CoreEditor", - "Microsoft.NetCore.Component.SDK", - "Microsoft.NetCore.Component.DevelopmentTools", - "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites", - "Microsoft.VisualStudio.Component.TextTemplating", - "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites", - "Microsoft.VisualStudio.Component.Debugger.JustInTime", - "Microsoft.VisualStudio.Workload.ManagedDesktop", - "Microsoft.VisualStudio.Component.MonoDebugger", - "Microsoft.VisualStudio.ComponentGroup.Maui.All", - "Microsoft.VisualStudio.Workload.NetCrossPlat", - "Microsoft.VisualStudio.Workload.NetCoreTools" - ] -} diff --git a/Emerald.Uno/Directory.Build.props b/Emerald.Uno/Directory.Build.props deleted file mode 100644 index 2bd4f977..00000000 --- a/Emerald.Uno/Directory.Build.props +++ /dev/null @@ -1,23 +0,0 @@ - - - enable - enable - true - - - $(NoWarn);NU1507;NETSDK1201;PRI257 - - - - - 4.1.23 - 6.0.18 - 5.0.13 - 5.2.14 - - diff --git a/Emerald.Uno/Directory.Build.targets b/Emerald.Uno/Directory.Build.targets deleted file mode 100644 index f75adf7e..00000000 --- a/Emerald.Uno/Directory.Build.targets +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/Emerald.Uno/Directory.Packages.props b/Emerald.Uno/Directory.Packages.props deleted file mode 100644 index 0cea764d..00000000 --- a/Emerald.Uno/Directory.Packages.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/Emerald.Uno/Emerald.Uno.sln b/Emerald.Uno/Emerald.Uno.sln deleted file mode 100644 index 2b517401..00000000 --- a/Emerald.Uno/Emerald.Uno.sln +++ /dev/null @@ -1,88 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.2.32210.308 -MinimumVisualStudioVersion = 15.0.26124.0 - -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emerald.Uno", "Emerald.Uno\Emerald.Uno.csproj", "{56590F45-D858-45B0-AD87-84D23799BF2D}" -EndProject - -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BADA71DC-7FFD-4EDC-9F28-FB74AEADC713}" - ProjectSection(SolutionItems) = preProject - .gitignore = .gitignore - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - global.json = global.json - Directory.Packages.props = Directory.Packages.props - .vsconfig = .vsconfig - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|ARM64 = Debug|ARM64 - Debug|iPhone = Debug|iPhone - Debug|iPhoneSimulator = Debug|iPhoneSimulator - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|ARM64 = Release|ARM64 - Release|iPhone = Release|iPhone - Release|iPhoneSimulator = Release|iPhoneSimulator - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|ARM.ActiveCfg = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|ARM.Build.0 = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|ARM.Deploy.0 = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|ARM64.Build.0 = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|ARM64.Deploy.0 = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|iPhone.Build.0 = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|iPhone.Deploy.0 = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|x64.ActiveCfg = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|x64.Build.0 = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|x64.Deploy.0 = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|x86.ActiveCfg = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|x86.Build.0 = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Debug|x86.Deploy.0 = Debug|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|Any CPU.Build.0 = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|Any CPU.Deploy.0 = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|ARM.ActiveCfg = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|ARM.Build.0 = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|ARM.Deploy.0 = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|ARM64.ActiveCfg = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|ARM64.Build.0 = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|ARM64.Deploy.0 = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|iPhone.ActiveCfg = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|iPhone.Build.0 = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|iPhone.Deploy.0 = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|x64.ActiveCfg = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|x64.Build.0 = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|x64.Deploy.0 = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|x86.ActiveCfg = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|x86.Build.0 = Release|Any CPU - {56590F45-D858-45B0-AD87-84D23799BF2D}.Release|x86.Deploy.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {AB135C24-13F4-4748-B054-A09A7EDEAF5D} - EndGlobalSection -EndGlobal diff --git a/Emerald.Uno/Emerald.Uno/App.xaml b/Emerald.Uno/Emerald.Uno/App.xaml deleted file mode 100644 index c099af18..00000000 --- a/Emerald.Uno/Emerald.Uno/App.xaml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/Emerald.Uno/Emerald.Uno/App.xaml.cs b/Emerald.Uno/Emerald.Uno/App.xaml.cs deleted file mode 100644 index af8abac3..00000000 --- a/Emerald.Uno/Emerald.Uno/App.xaml.cs +++ /dev/null @@ -1,93 +0,0 @@ -using Uno.Resizetizer; - -namespace Emerald.Uno; - -public partial class App : Application -{ - /// - /// Initializes the singleton application object. This is the first line of authored code - /// executed, and as such is the logical equivalent of main() or WinMain(). - /// - public App() - { - this.InitializeComponent(); - } - - protected Window? MainWindow { get; private set; } - protected IHost? Host { get; private set; } - - protected override void OnLaunched(LaunchActivatedEventArgs args) - { - var builder = this.CreateBuilder(args) - .Configure(host => host -#if DEBUG - // Switch to Development environment when running in DEBUG - .UseEnvironment(Environments.Development) -#endif - .UseLogging(configure: (context, logBuilder) => - { - // Configure log levels for different categories of logging - logBuilder - .SetMinimumLevel( - context.HostingEnvironment.IsDevelopment() ? - LogLevel.Information : - LogLevel.Warning) - - // Default filters for core Uno Platform namespaces - .CoreLogLevel(LogLevel.Warning); - - // Uno Platform namespace filter groups - // Uncomment individual methods to see more detailed logging - //// Generic Xaml events - //logBuilder.XamlLogLevel(LogLevel.Debug); - //// Layout specific messages - //logBuilder.XamlLayoutLogLevel(LogLevel.Debug); - //// Storage messages - //logBuilder.StorageLogLevel(LogLevel.Debug); - //// Binding related messages - //logBuilder.XamlBindingLogLevel(LogLevel.Debug); - //// Binder memory references tracking - //logBuilder.BinderMemoryReferenceLogLevel(LogLevel.Debug); - //// DevServer and HotReload related - //logBuilder.HotReloadCoreLogLevel(LogLevel.Information); - //// Debug JS interop - //logBuilder.WebAssemblyLogLevel(LogLevel.Debug); - - }, enableUnoLogging: true) - .ConfigureServices((context, services) => - { - // TODO: Register your services - //services.AddSingleton(); - }) - ); - MainWindow = builder.Window; - -#if DEBUG - MainWindow.EnableHotReload(); -#endif - MainWindow.SetWindowIcon(); - - Host = builder.Build(); - - // Do not repeat app initialization when the Window already has content, - // just ensure that the window is active - if (MainWindow.Content is not Frame rootFrame) - { - // Create a Frame to act as the navigation context and navigate to the first page - rootFrame = new Frame(); - - // Place the frame in the current Window - MainWindow.Content = rootFrame; - } - - if (rootFrame.Content == null) - { - // When the navigation stack isn't restored navigate to the first page, - // configuring the new page by passing required information as a navigation - // parameter - rootFrame.Navigate(typeof(MainPage), args.Arguments); - } - // Ensure the current window is active - MainWindow.Activate(); - } -} diff --git a/Emerald.Uno/Emerald.Uno/Assets/Icons/icon.svg b/Emerald.Uno/Emerald.Uno/Assets/Icons/icon.svg deleted file mode 100644 index a15af53a..00000000 --- a/Emerald.Uno/Emerald.Uno/Assets/Icons/icon.svg +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - diff --git a/Emerald.Uno/Emerald.Uno/Assets/Icons/icon_foreground.svg b/Emerald.Uno/Emerald.Uno/Assets/Icons/icon_foreground.svg deleted file mode 100644 index 8ffc41ae..00000000 --- a/Emerald.Uno/Emerald.Uno/Assets/Icons/icon_foreground.svg +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Emerald.Uno/Emerald.Uno/Assets/SharedAssets.md b/Emerald.Uno/Emerald.Uno/Assets/SharedAssets.md deleted file mode 100644 index 1b84a74a..00000000 --- a/Emerald.Uno/Emerald.Uno/Assets/SharedAssets.md +++ /dev/null @@ -1,32 +0,0 @@ -# Shared Assets - -See documentation about assets here: https://github.com/unoplatform/uno/blob/master/doc/articles/features/working-with-assets.md - -## Here is a cheat sheet - -1. Add the image file to the `Assets` directory of a shared project. -2. Set the build action to `Content`. -3. (Recommended) Provide an asset for various scales/dpi - -### Examples - -```text -\Assets\Images\logo.scale-100.png -\Assets\Images\logo.scale-200.png -\Assets\Images\logo.scale-400.png - -\Assets\Images\scale-100\logo.png -\Assets\Images\scale-200\logo.png -\Assets\Images\scale-400\logo.png -``` - -### Table of scales - -| Scale | WinUI | iOS/MacCatalyst | Android | -|-------|:-----------:|:---------------:|:-------:| -| `100` | scale-100 | @1x | mdpi | -| `125` | scale-125 | N/A | N/A | -| `150` | scale-150 | N/A | hdpi | -| `200` | scale-200 | @2x | xhdpi | -| `300` | scale-300 | @3x | xxhdpi | -| `400` | scale-400 | N/A | xxxhdpi | diff --git a/Emerald.Uno/Emerald.Uno/Assets/Splash/splash_screen.svg b/Emerald.Uno/Emerald.Uno/Assets/Splash/splash_screen.svg deleted file mode 100644 index 8ffc41ae..00000000 --- a/Emerald.Uno/Emerald.Uno/Assets/Splash/splash_screen.svg +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Emerald.Uno/Emerald.Uno/Emerald.Uno.csproj b/Emerald.Uno/Emerald.Uno/Emerald.Uno.csproj deleted file mode 100644 index 5fc9bc3f..00000000 --- a/Emerald.Uno/Emerald.Uno/Emerald.Uno.csproj +++ /dev/null @@ -1,32 +0,0 @@ - - - - net8.0-maccatalyst; - net8.0-desktop; - - - Exe - true - - - Emerald.Uno - - com.Riverside.Emerald.Uno - - 1.0 - 1 - - - - Lottie; - Hosting; - Toolkit; - Logging; - ThemeService; - - - - diff --git a/Emerald.Uno/Emerald.Uno/GlobalUsings.cs b/Emerald.Uno/Emerald.Uno/GlobalUsings.cs deleted file mode 100644 index 2f101745..00000000 --- a/Emerald.Uno/Emerald.Uno/GlobalUsings.cs +++ /dev/null @@ -1,5 +0,0 @@ -global using System.Collections.Immutable; -global using Microsoft.Extensions.DependencyInjection; -global using Microsoft.Extensions.Hosting; -global using Microsoft.Extensions.Logging; -global using ApplicationExecutionState = Windows.ApplicationModel.Activation.ApplicationExecutionState; diff --git a/Emerald.Uno/Emerald.Uno/MainPage.xaml b/Emerald.Uno/Emerald.Uno/MainPage.xaml deleted file mode 100644 index fabe71b5..00000000 --- a/Emerald.Uno/Emerald.Uno/MainPage.xaml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - diff --git a/Emerald.Uno/Emerald.Uno/MainPage.xaml.cs b/Emerald.Uno/Emerald.Uno/MainPage.xaml.cs deleted file mode 100644 index 7221ba67..00000000 --- a/Emerald.Uno/Emerald.Uno/MainPage.xaml.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Emerald.Uno; - -public sealed partial class MainPage : Page -{ - public MainPage() - { - this.InitializeComponent(); - } -} diff --git a/Emerald.Uno/Emerald.Uno/Package.appxmanifest b/Emerald.Uno/Emerald.Uno/Package.appxmanifest deleted file mode 100644 index 4a56eba6..00000000 --- a/Emerald.Uno/Emerald.Uno/Package.appxmanifest +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - Emerald.Uno - Emerald.Uno - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Emerald.Uno/Emerald.Uno/Platforms/Desktop/Program.cs b/Emerald.Uno/Emerald.Uno/Platforms/Desktop/Program.cs deleted file mode 100644 index fa9a1876..00000000 --- a/Emerald.Uno/Emerald.Uno/Platforms/Desktop/Program.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Uno.UI.Runtime.Skia; - -namespace Emerald.Uno; - -public class Program -{ - [STAThread] - public static void Main(string[] args) - { - var host = SkiaHostBuilder.Create() - .App(() => new App()) - .UseX11() - .UseLinuxFrameBuffer() - .UseMacOS() - .UseWindows() - .Build(); - - host.Run(); - } -} diff --git a/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Entitlements.plist b/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Entitlements.plist deleted file mode 100644 index 24c31036..00000000 --- a/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Entitlements.plist +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Info.plist b/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Info.plist deleted file mode 100644 index 1bb02ddc..00000000 --- a/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - UIDeviceFamily - - 2 - - LSApplicationCategoryType - public.app-category.utilities - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - XSAppIconAssets - Assets.xcassets/icon.appiconset - - - - diff --git a/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Main.maccatalyst.cs b/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Main.maccatalyst.cs deleted file mode 100644 index 123635ea..00000000 --- a/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Main.maccatalyst.cs +++ /dev/null @@ -1,14 +0,0 @@ -using UIKit; - -namespace Emerald.Uno.MacCatalyst; - -public class EntryPoint -{ - // This is the main entry point of the application. - public static void Main(string[] args) - { - // if you want to use a different Application Delegate class from "AppDelegate" - // you can specify it here. - UIApplication.Main(args, null, typeof(App)); - } -} diff --git a/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json b/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json deleted file mode 100644 index 69555e44..00000000 --- a/Emerald.Uno/Emerald.Uno/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "images": [ - { - "orientation": "portrait", - "extent": "full-screen", - "minimum-system-version": "7.0", - "scale": "2x", - "size": "640x960", - "idiom": "iphone" - }, - { - "orientation": "portrait", - "extent": "full-screen", - "minimum-system-version": "7.0", - "subtype": "retina4", - "scale": "2x", - "size": "640x1136", - "idiom": "iphone" - }, - { - "orientation": "portrait", - "extent": "full-screen", - "minimum-system-version": "7.0", - "scale": "1x", - "size": "768x1024", - "idiom": "ipad" - }, - { - "orientation": "landscape", - "extent": "full-screen", - "minimum-system-version": "7.0", - "scale": "1x", - "size": "1024x768", - "idiom": "ipad" - }, - { - "orientation": "portrait", - "extent": "full-screen", - "minimum-system-version": "7.0", - "scale": "2x", - "size": "1536x2048", - "idiom": "ipad" - }, - { - "orientation": "landscape", - "extent": "full-screen", - "minimum-system-version": "7.0", - "scale": "2x", - "size": "2048x1536", - "idiom": "ipad" - } - ], - "properties": {}, - "info": { - "version": 1, - "author": "" - } -} \ No newline at end of file diff --git a/Emerald.Uno/Emerald.Uno/Properties/launchSettings.json b/Emerald.Uno/Emerald.Uno/Properties/launchSettings.json deleted file mode 100644 index 3b3d93a5..00000000 --- a/Emerald.Uno/Emerald.Uno/Properties/launchSettings.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:8080", - "sslPort": 0 - } - }, - "profiles": { - "Emerald.Uno (Desktop)": { - "commandName": "Project", - "compatibleTargetFramework": "desktop" - }, - "Emerald.Uno (Desktop WSL2)": { - "commandName": "WSL2", - "commandLineArgs": "{ProjectDir}/bin/Debug/net8.0-desktop/Emerald.Uno.dll", - "distributionName": "", - "compatibleTargetFramework": "desktop" - } - } -} diff --git a/Emerald.Uno/Emerald.Uno/ReadMe.md b/Emerald.Uno/Emerald.Uno/ReadMe.md deleted file mode 100644 index 93482da2..00000000 --- a/Emerald.Uno/Emerald.Uno/ReadMe.md +++ /dev/null @@ -1,7 +0,0 @@ -# Getting Started - -Welcome to the Uno Platform! - -To discover how to get started with your new app: https://aka.platform.uno/get-started - -For more information on how to use the Uno.Sdk or upgrade Uno Platform packages in your solution: https://aka.platform.uno/using-uno-sdk \ No newline at end of file diff --git a/Emerald.Uno/Emerald.Uno/Strings/en/Resources.resw b/Emerald.Uno/Emerald.Uno/Strings/en/Resources.resw deleted file mode 100644 index 2723b3c3..00000000 --- a/Emerald.Uno/Emerald.Uno/Strings/en/Resources.resw +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Emerald.Uno-en - - diff --git a/Emerald.Uno/Emerald.Uno/app.manifest b/Emerald.Uno/Emerald.Uno/app.manifest deleted file mode 100644 index a61e665f..00000000 --- a/Emerald.Uno/Emerald.Uno/app.manifest +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - true/PM - PerMonitorV2, PerMonitor - - - diff --git a/Emerald.Uno/global.json b/Emerald.Uno/global.json deleted file mode 100644 index ce7228cb..00000000 --- a/Emerald.Uno/global.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information. - "msbuild-sdks": { - "Uno.Sdk": "5.2.175" - }, - "sdk": { - "allowPrerelease": false - } -} From 28eb041f199e131e9f8f6f5b70a0cb3c25646b91 Mon Sep 17 00:00:00 2001 From: Lamparter Date: Thu, 18 Jul 2024 17:31:17 +0100 Subject: [PATCH 20/61] Add universal solution --- .editorconfig | 173 +++++++++- .github/ISSUE_TEMPLATE/bug_report.yml | 101 ++++-- .github/ISSUE_TEMPLATE/feature_request.yml | 57 ++-- .github/ISSUE_TEMPLATE/sample/bug_report.yml | 83 +++++ .github/ISSUE_TEMPLATE/sample/config.yml | 1 + .../ISSUE_TEMPLATE/sample/feature_request.yml | 39 +++ .github/ISSUE_TEMPLATE/sample/spec.yml | 80 +++++ .github/Install-WindowsSdkISO.ps1 | 314 ++++++++++++++++++ .github/dependabot.yml | 11 + .github/steps/install_dependencies/action.yml | 45 +++ .github/workflows/ci.yml | 36 ++ .gitignore | 47 ++- .vscode/extensions.json | 5 + .vscode/launch.json | 35 ++ .vscode/settings.json | 10 + .vscode/tasks.json | 31 ++ .vsconfig | 19 ++ Directory.Build.props | 23 ++ Directory.Build.targets | 2 + Directory.Packages.props | 9 + Emerald.sln | 149 +-------- Emerald/App.xaml | 19 ++ Emerald/App.xaml.cs | 62 ++++ Emerald/Assets/Icons/icon.svg | 42 +++ Emerald/Assets/Icons/icon_foreground.svg | 137 ++++++++ Emerald/Assets/SharedAssets.md | 32 ++ Emerald/Assets/Splash/splash_screen.svg | 137 ++++++++ Emerald/Emerald.csproj | 44 +++ Emerald/GlobalUsings.cs | 7 + Emerald/MainPage.xaml | 14 + Emerald/MainPage.xaml.cs | 9 + Emerald/Package.appxmanifest | 43 +++ Emerald/Platforms/Desktop/Program.cs | 19 ++ .../Platforms/MacCatalyst/Entitlements.plist | 6 + Emerald/Platforms/MacCatalyst/Info.plist | 26 ++ .../Platforms/MacCatalyst/Main.maccatalyst.cs | 13 + .../LaunchImages.launchimage/Contents.json | 58 ++++ .../PublishProfiles/win-arm64.pubxml | 22 ++ .../Properties/PublishProfiles/win-x64.pubxml | 22 ++ .../Properties/PublishProfiles/win-x86.pubxml | 22 ++ Emerald/Properties/launchSettings.json | 31 ++ Emerald/ReadMe.md | 7 + Emerald/Strings/en/Resources.resw | 123 +++++++ Emerald/app.manifest | 25 ++ global.json | 9 + 45 files changed, 1980 insertions(+), 219 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/sample/bug_report.yml create mode 100644 .github/ISSUE_TEMPLATE/sample/config.yml create mode 100644 .github/ISSUE_TEMPLATE/sample/feature_request.yml create mode 100644 .github/ISSUE_TEMPLATE/sample/spec.yml create mode 100644 .github/Install-WindowsSdkISO.ps1 create mode 100644 .github/dependabot.yml create mode 100644 .github/steps/install_dependencies/action.yml create mode 100644 .github/workflows/ci.yml create mode 100644 .vscode/extensions.json create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json create mode 100644 .vscode/tasks.json create mode 100644 .vsconfig create mode 100644 Directory.Build.props create mode 100644 Directory.Build.targets create mode 100644 Directory.Packages.props create mode 100644 Emerald/App.xaml create mode 100644 Emerald/App.xaml.cs create mode 100644 Emerald/Assets/Icons/icon.svg create mode 100644 Emerald/Assets/Icons/icon_foreground.svg create mode 100644 Emerald/Assets/SharedAssets.md create mode 100644 Emerald/Assets/Splash/splash_screen.svg create mode 100644 Emerald/Emerald.csproj create mode 100644 Emerald/GlobalUsings.cs create mode 100644 Emerald/MainPage.xaml create mode 100644 Emerald/MainPage.xaml.cs create mode 100644 Emerald/Package.appxmanifest create mode 100644 Emerald/Platforms/Desktop/Program.cs create mode 100644 Emerald/Platforms/MacCatalyst/Entitlements.plist create mode 100644 Emerald/Platforms/MacCatalyst/Info.plist create mode 100644 Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs create mode 100644 Emerald/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json create mode 100644 Emerald/Platforms/Windows/Properties/PublishProfiles/win-arm64.pubxml create mode 100644 Emerald/Platforms/Windows/Properties/PublishProfiles/win-x64.pubxml create mode 100644 Emerald/Platforms/Windows/Properties/PublishProfiles/win-x86.pubxml create mode 100644 Emerald/Properties/launchSettings.json create mode 100644 Emerald/ReadMe.md create mode 100644 Emerald/Strings/en/Resources.resw create mode 100644 Emerald/app.manifest create mode 100644 global.json diff --git a/.editorconfig b/.editorconfig index ea0c3b57..b947be64 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,22 +1,167 @@ -[*.cs] +; This file is for unifying the coding style for different editors and IDEs. +; More information at http://editorconfig.org -# CS8618: Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. -dotnet_diagnostic.CS8618.severity = silent +# This file is the top-most EditorConfig file +root = true -dotnet_diagnostic.CS8604.severity = silent +########################################## +# Common Settings +########################################## -dotnet_diagnostic.CS8622.severity = silent +[*] +indent_style = space +end_of_line = crlf +trim_trailing_whitespace = true +insert_final_newline = true +charset = utf-8 -dotnet_diagnostic.CS8625.severity = silent +########################################## +# File Extension Settings +########################################## -# CS8602: Dereference of a possibly null reference. -dotnet_diagnostic.CS8602.severity = silent +[*.{yml,yaml}] +indent_size = 2 -# CS8603: Possible null reference return. -dotnet_diagnostic.CS8603.severity = silent +[.vsconfig] +indent_size = 2 +end_of_line = lf -# CS0252: Possible unintended reference comparison; left hand side needs cast -dotnet_diagnostic.CS0252.severity = silent +[*.sln] +indent_style = tab +indent_size = 2 -# CS8600: Converting null literal or possible null value to non-nullable type. -dotnet_diagnostic.CS8600.severity = silent +[*.{csproj,proj,projitems,shproj}] +indent_size = 2 + +[*.{json,slnf}] +indent_size = 2 +end_of_line = lf + +[*.{props,targets}] +indent_size = 2 + +[*.xaml] +indent_size = 2 +charset = utf-8-bom + +[*.xml] +indent_size = 2 +end_of_line = lf + +[*.plist] +indent_size = 2 +indent_style = tab +end_of_line = lf + +[*.manifest] +indent_size = 2 + +[*.appxmanifest] +indent_size = 2 + +[*.{json,css,webmanifest}] +indent_size = 2 +end_of_line = lf + +[web.config] +indent_size = 2 +end_of_line = lf + +[*.sh] +indent_size = 2 +end_of_line = lf + +[*.cs] +# EOL should be normalized by Git. See https://github.com/dotnet/format/issues/1099 +end_of_line = unset + +# See https://github.com/dotnet/roslyn/issues/20356#issuecomment-310143926 +trim_trailing_whitespace = false + +tab_width = 4 +indent_size = 4 + +# Sort using and Import directives with System.* appearing first +dotnet_sort_system_directives_first = true + +# Avoid "this." and "Me." if not necessary +dotnet_style_qualification_for_field = false:suggestion +dotnet_style_qualification_for_property = false:suggestion +dotnet_style_qualification_for_method = false:suggestion +dotnet_style_qualification_for_event = false:suggestion + +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Naming styles + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_null_propagation = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion +dotnet_style_prefer_auto_properties = true:silent +dotnet_style_object_initializer = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_prefer_simplified_boolean_expressions = true:suggestion +dotnet_style_prefer_conditional_expression_over_assignment = true:silent +dotnet_style_prefer_conditional_expression_over_return = true:silent +dotnet_style_explicit_tuple_names = true:suggestion +dotnet_style_prefer_inferred_tuple_names = true:suggestion + +csharp_indent_labels = one_less_than_current +csharp_using_directive_placement = outside_namespace:silent +csharp_prefer_simple_using_statement = true:suggestion +csharp_prefer_braces = true:silent +csharp_style_namespace_declarations = file_scoped:warning +csharp_style_prefer_method_group_conversion = true:silent +csharp_style_prefer_top_level_statements = true:silent +csharp_style_prefer_primary_constructors = true:suggestion +csharp_style_expression_bodied_methods = false:silent +csharp_style_expression_bodied_constructors = false:silent +csharp_style_expression_bodied_operators = false:silent +csharp_style_expression_bodied_properties = true:silent +csharp_style_expression_bodied_indexers = true:silent +csharp_style_expression_bodied_accessors = true:silent +csharp_style_expression_bodied_lambdas = true:silent +csharp_style_expression_bodied_local_functions = false:silent diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 76877e92..f0774448 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -1,52 +1,83 @@ -name: 🐛 Bug Report -description: Create a bug report to help improve Emerald -labels: [bug] -title: "🐛 " +name: 🐞 Bug +title: '[BUG] ' +description: File a bug report +labels: ["bug", "to verify"] +assignees: [] body: - - type: checkboxes + - type: markdown attributes: - label: ⏱️ Before you start... - options: - - label: Are you on the latest version of Emerald? You might be using an old version. - required: true - - label: Have you checked whether or not a similar issue has already been reported? - required: true - - type: textarea - attributes: - label: 🪟 What build of Windows is this issue present? (optional) - description: Windows key + R > winver.exe - placeholder: build 25174.1010 + value: | + Thanks for taking the time to fill out this bug report! Please make sure to add as much detail as you can. - type: textarea + id: description attributes: - label: 🔢 What version of Emerald are you on? - description: Go to Emerald > Settings > About + label: Description + description: Please give a detailed description of the issue that you're seeing. You can add screenshots and videos as well. + placeholder: Tell us what you see! validations: required: true - type: textarea + id: repro-steps attributes: - label: 📄 Description - description: A clear and concise description of what the bug is. + label: Steps to Reproduce + description: Describe all the steps we need to take to show the behavior that you have observed. Also, include what you expected to happen and what did actually happen. + placeholder: | + 1. Create a File > New App + 2. Add a `Button` like so: `<Button Text="this is a bug" />` + 3. Click the added button and observe the bug 🐞 + + Expected outcome: a bug was added + Actual outcome: a ladybug appeared validations: required: true - - type: textarea + - type: dropdown + id: platform-with-bug attributes: - label: 🪜 Steps To Reproduce - description: Steps to reproduce the behavior. - placeholder: | - 1. Go to '....' - 2. Click on '....' - 3. Scroll down to '....' - 4. See the error + label: Platform with bug + description: What Platform is this bug affecting? + options: + - Core + - Android + - iOS + - MacCatalyst + - Windows + - Skia + - WebAssembly + - Other validations: - required: false - - type: textarea + required: true + + - type: dropdown + id: platforms-affected attributes: - label: 🤔 Expected behavior - description: A clear and concise description of what you expected to happen. + label: Affected platforms + description: Select all or any platform that you see this issue on. This helps us determine if it's something platform-specific or in the core. If you were only able to test on 1 platform, please check the last option to inform us about that. + multiple: true + options: + - Android + - iOS + - MacOS + - MacCatalyst + - Windows + - GTK + - Linux Framebuffer + - WPF + - Skia Desktop + - WebAssembly + - Other + - I was *not* able test on other platforms validations: required: true + + - type: textarea + id: workaround + attributes: + label: Did you find any workaround? + description: Did you find any workaround for this issue? This can unblock other people while waiting for this issue to be resolved or even give us a hint on how to fix this. + - type: textarea + id: logs attributes: - label: 📸 Assets - description: | - A list of assets (errors, screenshots) relevant to the bug. + label: Relevant log output + description: Please copy and paste any relevant log output. This will be auomatically formatted into code, so no need for back ticks. + render: shell diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 96fd262d..47b3fe78 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -1,44 +1,39 @@ -name: ✨ Feature Request -description: Request a new feature for Emerald -labels: [feature request] -title: "✨ " +name: Feature Request +description: Suggest an idea for this project +labels: ["enhancement"] +assignees: [] body: - type: markdown attributes: value: | - ##### ⏱️ Before you start... - - [ ] Have you checked whether or not a similar feature request has already been reported? + Fill in this template with some detail. A detailed description, perhaps supported with some screenshots, mockups, and a (public) API design in pseudo-code. - type: textarea + id: description attributes: - label: 📄 Description - description: A clear and concise description of what your idea is. Include things like possible use cases, drawbacks, etc. + label: Description + description: Please give us a detailed description of the feature that you envision. Focus on _what_ this feature does, over the _why_ you want this feature. What would be the end-result when implemented? Feel free to add any diagrams, (mocked up) screenshots, or other materials that support your story. + placeholder: I would love to have a button that I can make shiny. This is something that is supported on all the underlaying platforms. validations: required: true - type: textarea + id: api-changes attributes: - label: 🗃️ Alternative solutions - description: Describe more ways this idea could be implemented. - validations: - required: false - - type: textarea - attributes: - label: ✅ Tasks - description: Give an overview of all the specific things you would like to be changed or implemented. - value: | - ```[tasklist] - ### High Priority - - [ ] Something - - [ ] Another thing - - [ ] https://github.com/link/to/an/issue - ``` - ```[tasklist] - ### Nice to have - - [ ] Something - - [ ] Another thing - - [ ] https://github.com/link/to/an/issue + label: API Changes + description: Include a list of all API changes, additions, subtractions as would be required by your proposal. These APIs should be considered placeholders, so the naming is not as important as getting the concepts correct. If possible you should include some example (pseudo-)code of usage of your new API. + placeholder: | + ```csharp + var button = new Button (); + button.MakeShiny = true; // new API ``` + + The MakeShiny API works even if the button is already visible. + validations: + required: true - type: textarea + id: use-case attributes: - label: 📸 Assets - description: | - A list of assets (screenshots, mockups) relevant to this feature request. + label: Intended Use-Case + description: Provide a detailed example of where your proposal would be used and for what purpose. Focus on _why_ you want this feature instead of _what_ the feature does. + placeholder: I have a situation where I would really want a shiny button to make it stand out from the rest of the plain and boring buttons. + validations: + required: true \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/sample/bug_report.yml b/.github/ISSUE_TEMPLATE/sample/bug_report.yml new file mode 100644 index 00000000..f0774448 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/sample/bug_report.yml @@ -0,0 +1,83 @@ +name: 🐞 Bug +title: '[BUG] <title>' +description: File a bug report +labels: ["bug", "to verify"] +assignees: [] +body: + - type: markdown + attributes: + value: | + Thanks for taking the time to fill out this bug report! Please make sure to add as much detail as you can. + - type: textarea + id: description + attributes: + label: Description + description: Please give a detailed description of the issue that you're seeing. You can add screenshots and videos as well. + placeholder: Tell us what you see! + validations: + required: true + - type: textarea + id: repro-steps + attributes: + label: Steps to Reproduce + description: Describe all the steps we need to take to show the behavior that you have observed. Also, include what you expected to happen and what did actually happen. + placeholder: | + 1. Create a File > New App + 2. Add a `Button` like so: `<Button Text="this is a bug" />` + 3. Click the added button and observe the bug 🐞 + + Expected outcome: a bug was added + Actual outcome: a ladybug appeared + validations: + required: true + - type: dropdown + id: platform-with-bug + attributes: + label: Platform with bug + description: What Platform is this bug affecting? + options: + - Core + - Android + - iOS + - MacCatalyst + - Windows + - Skia + - WebAssembly + - Other + validations: + required: true + + - type: dropdown + id: platforms-affected + attributes: + label: Affected platforms + description: Select all or any platform that you see this issue on. This helps us determine if it's something platform-specific or in the core. If you were only able to test on 1 platform, please check the last option to inform us about that. + multiple: true + options: + - Android + - iOS + - MacOS + - MacCatalyst + - Windows + - GTK + - Linux Framebuffer + - WPF + - Skia Desktop + - WebAssembly + - Other + - I was *not* able test on other platforms + validations: + required: true + + - type: textarea + id: workaround + attributes: + label: Did you find any workaround? + description: Did you find any workaround for this issue? This can unblock other people while waiting for this issue to be resolved or even give us a hint on how to fix this. + + - type: textarea + id: logs + attributes: + label: Relevant log output + description: Please copy and paste any relevant log output. This will be auomatically formatted into code, so no need for back ticks. + render: shell diff --git a/.github/ISSUE_TEMPLATE/sample/config.yml b/.github/ISSUE_TEMPLATE/sample/config.yml new file mode 100644 index 00000000..3ba13e0c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/sample/config.yml @@ -0,0 +1 @@ +blank_issues_enabled: false diff --git a/.github/ISSUE_TEMPLATE/sample/feature_request.yml b/.github/ISSUE_TEMPLATE/sample/feature_request.yml new file mode 100644 index 00000000..47b3fe78 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/sample/feature_request.yml @@ -0,0 +1,39 @@ +name: Feature Request +description: Suggest an idea for this project +labels: ["enhancement"] +assignees: [] +body: + - type: markdown + attributes: + value: | + Fill in this template with some detail. A detailed description, perhaps supported with some screenshots, mockups, and a (public) API design in pseudo-code. + - type: textarea + id: description + attributes: + label: Description + description: Please give us a detailed description of the feature that you envision. Focus on _what_ this feature does, over the _why_ you want this feature. What would be the end-result when implemented? Feel free to add any diagrams, (mocked up) screenshots, or other materials that support your story. + placeholder: I would love to have a button that I can make shiny. This is something that is supported on all the underlaying platforms. + validations: + required: true + - type: textarea + id: api-changes + attributes: + label: API Changes + description: Include a list of all API changes, additions, subtractions as would be required by your proposal. These APIs should be considered placeholders, so the naming is not as important as getting the concepts correct. If possible you should include some example (pseudo-)code of usage of your new API. + placeholder: | + ```csharp + var button = new Button (); + button.MakeShiny = true; // new API + ``` + + The MakeShiny API works even if the button is already visible. + validations: + required: true + - type: textarea + id: use-case + attributes: + label: Intended Use-Case + description: Provide a detailed example of where your proposal would be used and for what purpose. Focus on _why_ you want this feature instead of _what_ the feature does. + placeholder: I have a situation where I would really want a shiny button to make it stand out from the rest of the plain and boring buttons. + validations: + required: true \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/sample/spec.yml b/.github/ISSUE_TEMPLATE/sample/spec.yml new file mode 100644 index 00000000..6abc3944 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/sample/spec.yml @@ -0,0 +1,80 @@ +name: Spec +description: An official specification for enhancements. +labels: ["enhancement"] +assignees: [] +body: + - type: markdown + attributes: + value: | + Thank you for taking the time to provide us with a detailed specification of your idea. + + In a spec you will give a detailed and complete representation of the (public) APIs that are implemented as part of this change. Additionally please think about backwards compatibility, breaking changes, supported platforms and the difficulty. + - type: textarea + id: description + attributes: + label: Description + description: Provide a concise description of the feature and the motivation for adding it. This can be a modified version from the feature request prior to this. + validations: + required: true + - type: textarea + id: api-changes + attributes: + label: (Public) API Changes + description: Include a complete list of all API changes, additions, subtractions as would be required by your proposal. + value: | + # [ class ] + + ## Properties + + | API | Description | + | ------------- | ------------- | + | [name] | Gets or sets [description]. | + + ## Events + + | API | Description | + | ------------- | ------------- | + | [name] | [API documentation/description] | + validations: + required: true + - type: textarea + id: usage-scenarios + attributes: + label: Usage Scenarios + description: Give us a couple of scenarios that demonstrate how developers would consume the above APIs. + placeholder: | + # C# Example + ```csharp + var thing = new MyNewControl(); + thing.BeAwesome = true; + thing.Color = Colors.Cornsilk; + ``` + + # XAML Example + ```xaml + <MyNewControl x:Name="thing" BeAwesome="true" Color="Cornsilk" /> + ``` + validations: + required: true + - type: textarea + id: backwards-compatibility + attributes: + label: Backward Compatibility + description: Please describe here anything in terms of backwards compatibility. Will there be breaking changes? Do we need to update dependencies to support this? What are the minimum supported API/OS levels? And lastly, are there any platforms that can't support this and why? + placeholder: | + Minimum API levels? + Breaking changes? + Unsupported platforms? + validations: + required: true + - type: dropdown + id: difficulty + attributes: + label: Difficulty + description: What do you feel will be the difficulty of this change all things considering? No exact science, just your gut feeling. + options: + - Low + - Medium + - High + validations: + required: true \ No newline at end of file diff --git a/.github/Install-WindowsSdkISO.ps1 b/.github/Install-WindowsSdkISO.ps1 new file mode 100644 index 00000000..f4964d23 --- /dev/null +++ b/.github/Install-WindowsSdkISO.ps1 @@ -0,0 +1,314 @@ +[CmdletBinding()] +param([Parameter(Mandatory=$true)] + [string]$buildNumber) + +# Ensure the error action preference is set to the default for PowerShell3, 'Stop' +$ErrorActionPreference = 'Stop' + +# Constants +$WindowsSDKOptions = @("OptionId.UWPCpp") +$WindowsSDKRegPath = "HKLM:\Software\Microsoft\Windows Kits\Installed Roots" +$WindowsSDKRegRootKey = "KitsRoot10" +$WindowsSDKVersion = "10.0.$buildNumber.0" +$WindowsSDKInstalledRegPath = "$WindowsSDKRegPath\$WindowsSDKVersion\Installed Options" +$StrongNameRegPath = "HKLM:\SOFTWARE\Microsoft\StrongName\Verification" +$PublicKeyTokens = @("31bf3856ad364e35") + +function Download-File +{ + param ([string] $outDir, + [string] $downloadUrl, + [string] $downloadName) + + $downloadPath = Join-Path $outDir "$downloadName.download" + $downloadDest = Join-Path $outDir $downloadName + $downloadDestTemp = Join-Path $outDir "$downloadName.tmp" + + Write-Host -NoNewline "Downloading $downloadName..." + + try + { + $webclient = new-object System.Net.WebClient + $webclient.DownloadFile($downloadUrl, $downloadPath) + } + catch [System.Net.WebException] + { + Write-Host + Write-Warning "Failed to fetch updated file from $downloadUrl" + if (!(Test-Path $downloadDest)) + { + throw "$downloadName was not found at $downloadDest" + } + else + { + Write-Warning "$downloadName may be out of date" + } + } + + Unblock-File $downloadPath + + $downloadDestTemp = $downloadPath; + + # Delete and rename to final dest + if (Test-Path -PathType Container $downloadDest) + { + [System.IO.Directory]::Delete($downloadDest, $true) + } + + Move-Item -Force $downloadDestTemp $downloadDest + Write-Host "Done" + + return $downloadDest +} + +function Get-ISODriveLetter +{ + param ([string] $isoPath) + + $diskImage = Get-DiskImage -ImagePath $isoPath + if ($diskImage) + { + $volume = Get-Volume -DiskImage $diskImage + + if ($volume) + { + $driveLetter = $volume.DriveLetter + if ($driveLetter) + { + $driveLetter += ":" + return $driveLetter + } + } + } + + return $null +} + +function Mount-ISO +{ + param ([string] $isoPath) + + # Check if image is already mounted + $isoDrive = Get-ISODriveLetter $isoPath + + if (!$isoDrive) + { + Mount-DiskImage -ImagePath $isoPath -StorageType ISO | Out-Null + } + + $isoDrive = Get-ISODriveLetter $isoPath + Write-Verbose "$isoPath mounted to ${isoDrive}:" +} + +function Dismount-ISO +{ + param ([string] $isoPath) + + $isoDrive = (Get-DiskImage -ImagePath $isoPath | Get-Volume).DriveLetter + + if ($isoDrive) + { + Write-Verbose "$isoPath dismounted" + Dismount-DiskImage -ImagePath $isoPath | Out-Null + } +} + +function Disable-StrongName +{ + param ([string] $publicKeyToken = "*") + + reg ADD "HKLM\SOFTWARE\Microsoft\StrongName\Verification\*,$publicKeyToken" /f | Out-Null + if ($env:PROCESSOR_ARCHITECTURE -eq "AMD64") + { + reg ADD "HKLM\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\*,$publicKeyToken" /f | Out-Null + } +} + +function Test-Admin +{ + $identity = [Security.Principal.WindowsIdentity]::GetCurrent() + $principal = New-Object Security.Principal.WindowsPrincipal $identity + $principal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator) +} + +function Test-RegistryPathAndValue +{ + param ( + [parameter(Mandatory=$true)] + [ValidateNotNullOrEmpty()] + [string] $path, + [parameter(Mandatory=$true)] + [ValidateNotNullOrEmpty()] + [string] $value) + + try + { + if (Test-Path $path) + { + Get-ItemProperty -Path $path | Select-Object -ExpandProperty $value -ErrorAction Stop | Out-Null + return $true + } + } + catch + { + } + + return $false +} + +function Test-InstallWindowsSDK +{ + $retval = $true + + if (Test-RegistryPathAndValue -Path $WindowsSDKRegPath -Value $WindowsSDKRegRootKey) + { + # A Windows SDK is installed + # Is an SDK of our version installed with the options we need? + if (Test-RegistryPathAndValue -Path $WindowsSDKInstalledRegPath -Value "$WindowsSDKOptions") + { + # It appears we have what we need. Double check the disk + $sdkRoot = Get-ItemProperty -Path $WindowsSDKRegPath | Select-Object -ExpandProperty $WindowsSDKRegRootKey + if ($sdkRoot) + { + if (Test-Path $sdkRoot) + { + $refPath = Join-Path $sdkRoot "References\$WindowsSDKVersion" + if (Test-Path $refPath) + { + $umdPath = Join-Path $sdkRoot "UnionMetadata\$WindowsSDKVersion" + if (Test-Path $umdPath) + { + # Pretty sure we have what we need + $retval = $false + } + } + } + } + } + } + + return $retval +} + +function Test-InstallStrongNameHijack +{ + foreach($publicKeyToken in $PublicKeyTokens) + { + $key = "$StrongNameRegPath\*,$publicKeyToken" + if (!(Test-Path $key)) + { + return $true + } + } + + return $false +} + +Write-Host -NoNewline "Checking for installed Windows SDK $WindowsSDKVersion..." +$InstallWindowsSDK = Test-InstallWindowsSDK +if ($InstallWindowsSDK) +{ + Write-Host "Installation required" +} +else +{ + Write-Host "INSTALLED" +} + +$StrongNameHijack = Test-InstallStrongNameHijack +Write-Host -NoNewline "Checking if StrongName bypass required..." + +if ($StrongNameHijack) +{ + Write-Host "REQUIRED" +} +else +{ + Write-Host "Done" +} + +if ($StrongNameHijack -or $InstallWindowsSDK) +{ + if (!(Test-Admin)) + { + Write-Host + throw "ERROR: Elevation required" + } +} + +if ($InstallWindowsSDK) +{ + # Static(ish) link for Windows SDK + # Note: there is a delay from Windows SDK announcements to availability via the static link + $uri = "https://go.microsoft.com/fwlink/?prd=11966&pver=1.0&plcid=0x409&clcid=0x409&ar=Flight&sar=Sdsurl&o1=$buildNumber" + + if($buildNumber -eq 18362) + { + # Workaround for removed SDK + $uri = "https://go.microsoft.com/fwlink/?linkid=2083448"; + } + + if($buildNumber -eq 19041) + { + # Workaround for missing SDK + $uri = "https://software-download.microsoft.com/download/pr/19041.1.191206-1406.vb_release_WindowsSDK.iso"; + } + + if ($env:TEMP -eq $null) + { + $env:TEMP = Join-Path $env:SystemDrive 'temp' + } + + $winsdkTempDir = Join-Path $env:TEMP "WindowsSDK" + + if (![System.IO.Directory]::Exists($winsdkTempDir)) + { + [void][System.IO.Directory]::CreateDirectory($winsdkTempDir) + } + + $file = "winsdk_$buildNumber.iso" + + Write-Verbose "Getting WinSDK from $uri" + $downloadFile = Download-File $winsdkTempDir $uri $file + + # TODO Check if zip, exe, iso, etc. + try + { + Write-Host -NoNewline "Mounting ISO $file..." + Mount-ISO $downloadFile + Write-Host "Done" + + $isoDrive = Get-ISODriveLetter $downloadFile + + if (Test-Path $isoDrive) + { + Write-Host -NoNewLine "Installing WinSDK..." + + $setupPath = Join-Path "$isoDrive" "WinSDKSetup.exe" + Start-Process -Wait $setupPath "/features $WindowsSDKOptions /q" + Write-Host "Done" + } + else + { + throw "Could not find mounted ISO at ${isoDrive}" + } + } + finally + { + Write-Host -NoNewline "Dismounting ISO $file..." + #Dismount-ISO $downloadFile + Write-Host "Done" + } +} + +if ($StrongNameHijack) +{ + Write-Host -NoNewline "Disabling StrongName for Windows SDK..." + + foreach($key in $PublicKeyTokens) + { + Disable-StrongName $key + } + + Write-Host "Done" +} diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..1147b3ac --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +version: 2 +updates: +- package-ecosystem: nuget + directory: "/" + schedule: + interval: weekly + time: "10:00" + open-pull-requests-limit: 10 + labels: + - kind/dependency + - do-not-merge/work-in-progress diff --git a/.github/steps/install_dependencies/action.yml b/.github/steps/install_dependencies/action.yml new file mode 100644 index 00000000..f8cd87b1 --- /dev/null +++ b/.github/steps/install_dependencies/action.yml @@ -0,0 +1,45 @@ +name: Install Dependencies +description: "" + +inputs: + target-platform: + description: 'The platform to install dependencies for. #See available values at https://platform.uno/docs/articles/external/uno.check/doc/using-uno-check.html' + required: false + default: 'all' + dotnet-version: + description: 'Installs and sets the .NET SDK Version' + required: false + default: '8.0.x' + sdkVersion: + description: 'The version of the Windows Sdk' + required: false + default: '19041' + +runs: + using: "composite" + steps: + # Install .NET + - name: Setup .NET ${{ inputs.dotnet-version }} + uses: actions/setup-dotnet@v3 + with: + dotnet-version: '${{ inputs.dotnet-version }}' + + # Install Windows SDK + - name: Install Windows SDK ${{ inputs.sdkVersion }} + shell: pwsh + if: ${{ runner.os == 'Windows' }} + run: .\.github\Install-WindowsSdkISO.ps1 ${{ inputs.sdkVersion }} + + # Run Uno.Check + - name: Install ${{ inputs.target-platform }} Workloads + shell: pwsh + run: | + dotnet tool install -g uno.check + ("${{ inputs.target-platform }} ".Split(' ') | ForEach-Object { + $target = $_.Replace("_win", "").Replace("_macos", "") + if (![string]::IsNullOrEmpty($target)) { + echo "target: $target" + uno-check -v --ci --non-interactive --fix --target $target --skip vswin --skip vsmac --skip xcode --skip vswinworkloads --skip androidemulator --skip dotnetnewunotemplates + echo "uno-check finished for target: $target " + } + }) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..3796bf27 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,36 @@ +name: CI + +on: + push: + branches: + - main + - release/** + + pull_request: + types: [opened, synchronize, reopened] + branches: + - main + - release/** +env: + STEP_TIMEOUT_MINUTES: 60 + +jobs: + smoke_test: + name: Smoke Test (Debug Build of Emerald) + runs-on: windows-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Install Dependencies + timeout-minutes: ${{ fromJSON(env.STEP_TIMEOUT_MINUTES) }} + uses: "./.github/steps/install_dependencies" + + # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v1.3.1 + + - name: Build Emerald (Debug) + shell: pwsh + run: msbuild ./Emerald/Emerald.csproj /r diff --git a/.gitignore b/.gitignore index 163adce0..ef88c205 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ ## 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 +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore # User-specific files *.rsuser @@ -29,7 +29,6 @@ x86/ bld/ [Bb]in/ [Oo]bj/ -[Oo]ut/ [Ll]og/ [Ll]ogs/ @@ -91,6 +90,7 @@ StyleCopReport.xml *.tmp_proj *_wpftmp.csproj *.log +*.tlog *.vspscc *.vssscc .builds @@ -294,6 +294,17 @@ node_modules/ # Visual Studio 6 auto-generated workspace file (contains which files were open etc.) *.vbw +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + # Visual Studio LightSwitch build output **/*.HTMLClient/GeneratedArtifacts **/*.DesktopClient/GeneratedArtifacts @@ -350,6 +361,9 @@ ASALocalRun/ # Local History for Visual Studio .localhistory/ +# Visual Studio History (VSHistory) files +.vshistory/ + # BeatPulse healthcheck temp database healthchecksdb @@ -361,6 +375,29 @@ MigrationBackup/ # Fody - auto-generated XML schema FodyWeavers.xsd -/Emerald.App/Emerald.App/MsalClientID.txt -/Emerald.Core/MsalClientID.txt -/Emerald.App/Emerald.App/GithubClientID.txt + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml + +# Single Target Config +solution-config.props +# Publish Profiles +!**/Properties/PublishProfiles/*.pubxml \ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 00000000..a63ad400 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "unoplatform.vscode" + ], +} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..1d6e6504 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,35 @@ +{ + // Use IntelliSense to find out which attributes exist for C# debugging + // Use hover for the description of the existing attributes + // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md + "version": "0.2.0", + "configurations": [ + { + "name": "Uno Platform Mobile", + "type": "Uno", + "request": "launch", + // any Uno* task will do, this is simply to satisfy vscode requirement when a launch.json is present + "preLaunchTask": "Uno: android | Debug | android-x64" + }, + { + // Use IntelliSense to find out which attributes exist for C# debugging + // Use hover for the description of the existing attributes + // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md + "name": "Uno Platform Desktop (Debug)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build-desktop", + // If you have changed target frameworks, make sure to update the program path. + "program": "${workspaceFolder}/Emerald/bin/Debug/net8.0-desktop/Emerald.dll", + "args": [], + "launchSettingsProfile": "Emerald (Desktop)", + "env": { + "DOTNET_MODIFIABLE_ASSEMBLIES": "debug" + }, + "cwd": "${workspaceFolder}/Emerald", + // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console + "console": "internalConsole", + "stopAtEntry": false + }, + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..3405922d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,10 @@ +{ + "explorer.fileNesting.enabled": true, + "explorer.fileNesting.expand": false, + "explorer.fileNesting.patterns": { + "*.xaml": "$(capture).xaml.cs" + }, + "files.associations": { + "global.json": "jsonc" + } +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000..ac5be062 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,31 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build-desktop", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/Emerald/Emerald.csproj", + "/property:GenerateFullPaths=true", + "/property:TargetFramework=net8.0-desktop", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish-desktop", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/Emerald/Emerald.csproj", + "/property:GenerateFullPaths=true", + "/property:TargetFramework=net8.0-desktop", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + } + ] +} diff --git a/.vsconfig b/.vsconfig new file mode 100644 index 00000000..8e1dd5e5 --- /dev/null +++ b/.vsconfig @@ -0,0 +1,19 @@ +{ + "version": "1.0", + "components": [ + "Microsoft.VisualStudio.Component.CoreEditor", + "Microsoft.VisualStudio.Workload.CoreEditor", + "Microsoft.NetCore.Component.SDK", + "Microsoft.NetCore.Component.DevelopmentTools", + "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites", + "Microsoft.VisualStudio.Component.TextTemplating", + "Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging", + "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites", + "Microsoft.VisualStudio.Component.Debugger.JustInTime", + "Microsoft.VisualStudio.Workload.ManagedDesktop", + "Microsoft.VisualStudio.Component.MonoDebugger", + "Microsoft.VisualStudio.ComponentGroup.Maui.All", + "Microsoft.VisualStudio.Workload.NetCrossPlat", + "Microsoft.VisualStudio.Workload.NetCoreTools" + ] +} diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 00000000..69a93b76 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,23 @@ +<Project> + <PropertyGroup> + <ImplicitUsings>enable</ImplicitUsings> + <Nullable>enable</Nullable> + <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> + + <!-- + Adding NoWarn to remove build warnings + NU1507: Warning when there are multiple package sources when using CPM with no source mapping + NETSDK1201: Warning that specifying RID won't create self containing app + PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk) + --> + <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn> + </PropertyGroup> + + <!-- See https://aka.platform.uno/using-uno-sdk#implicit-packages for more information regarding the Implicit Packages version properties. --> + <PropertyGroup> + <UnoExtensionsVersion>4.1.24</UnoExtensionsVersion> + <UnoToolkitVersion>6.0.24</UnoToolkitVersion> + <UnoThemesVersion>5.0.13</UnoThemesVersion> + <UnoCSharpMarkupVersion>5.2.14</UnoCSharpMarkupVersion> + </PropertyGroup> +</Project> diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 00000000..f75adf7e --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,2 @@ +<Project> +</Project> diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000..0cea764d --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,9 @@ +<Project ToolsVersion="15.0"> + <!-- + To update the version of Uno, you should instead update the Sdk version in the global.json file. + + See https://aka.platform.uno/using-uno-sdk for more information. + --> + <ItemGroup> + </ItemGroup> +</Project> diff --git a/Emerald.sln b/Emerald.sln index d6e0b24a..c11b44ea 100644 --- a/Emerald.sln +++ b/Emerald.sln @@ -1,155 +1,36 @@ + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.2.32602.215 +VisualStudioVersion = 17.11.35103.136 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emerald.Core", "Emerald.Core\Emerald.Core.csproj", "{90389A34-9F42-4489-871A-DC726D74854D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emerald", "Emerald\Emerald.csproj", "{9D3213F4-E514-4E7D-872A-725DB4872436}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emerald.App", "Emerald.App\Emerald.App\Emerald.App.csproj", "{F2065381-1265-4FEB-841A-E5798E62761D}" -EndProject -Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Package.WinUI", "Emerald.App\Emerald.App.Package\Package.WinUI.wapproj", "{59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{2BB1A64C-5C5D-415D-B816-66E2152E2703}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3142BDF3-E95C-4F0F-8701-CF981F6EA3C0}" ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - .gitattributes = .gitattributes .gitignore = .gitignore - .github\azp\azp.yml = .github\azp\azp.yml - README.md = README.md + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + Directory.Packages.props = Directory.Packages.props + global.json = global.json EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CmlLib", "CMLLib\CmlLib\CmlLib.csproj", "{7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emerald.CoreX", "Emerald.CoreX\Emerald.CoreX.csproj", "{13795E09-8131-4716-9EBC-970952E9F360}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|ARM64 = Debug|ARM64 - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|ARM64 = Release|ARM64 - Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {90389A34-9F42-4489-871A-DC726D74854D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Debug|ARM.ActiveCfg = Debug|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Debug|ARM.Build.0 = Debug|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Debug|ARM64.Build.0 = Debug|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Debug|x64.ActiveCfg = Debug|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Debug|x64.Build.0 = Debug|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Debug|x86.ActiveCfg = Debug|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Debug|x86.Build.0 = Debug|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Release|Any CPU.Build.0 = Release|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Release|ARM.ActiveCfg = Release|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Release|ARM.Build.0 = Release|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Release|ARM64.ActiveCfg = Release|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Release|ARM64.Build.0 = Release|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Release|x64.ActiveCfg = Release|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Release|x64.Build.0 = Release|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Release|x86.ActiveCfg = Release|Any CPU - {90389A34-9F42-4489-871A-DC726D74854D}.Release|x86.Build.0 = Release|Any CPU - {F2065381-1265-4FEB-841A-E5798E62761D}.Debug|Any CPU.ActiveCfg = Debug|x64 - {F2065381-1265-4FEB-841A-E5798E62761D}.Debug|Any CPU.Build.0 = Debug|x64 - {F2065381-1265-4FEB-841A-E5798E62761D}.Debug|ARM.ActiveCfg = Debug|x86 - {F2065381-1265-4FEB-841A-E5798E62761D}.Debug|ARM.Build.0 = Debug|x86 - {F2065381-1265-4FEB-841A-E5798E62761D}.Debug|ARM64.ActiveCfg = Debug|arm64 - {F2065381-1265-4FEB-841A-E5798E62761D}.Debug|ARM64.Build.0 = Debug|arm64 - {F2065381-1265-4FEB-841A-E5798E62761D}.Debug|x64.ActiveCfg = Debug|x64 - {F2065381-1265-4FEB-841A-E5798E62761D}.Debug|x64.Build.0 = Debug|x64 - {F2065381-1265-4FEB-841A-E5798E62761D}.Debug|x86.ActiveCfg = Debug|x86 - {F2065381-1265-4FEB-841A-E5798E62761D}.Debug|x86.Build.0 = Debug|x86 - {F2065381-1265-4FEB-841A-E5798E62761D}.Release|Any CPU.ActiveCfg = Release|x64 - {F2065381-1265-4FEB-841A-E5798E62761D}.Release|Any CPU.Build.0 = Release|x64 - {F2065381-1265-4FEB-841A-E5798E62761D}.Release|ARM.ActiveCfg = Release|x64 - {F2065381-1265-4FEB-841A-E5798E62761D}.Release|ARM.Build.0 = Release|x64 - {F2065381-1265-4FEB-841A-E5798E62761D}.Release|ARM64.ActiveCfg = Release|arm64 - {F2065381-1265-4FEB-841A-E5798E62761D}.Release|ARM64.Build.0 = Release|arm64 - {F2065381-1265-4FEB-841A-E5798E62761D}.Release|x64.ActiveCfg = Release|x64 - {F2065381-1265-4FEB-841A-E5798E62761D}.Release|x64.Build.0 = Release|x64 - {F2065381-1265-4FEB-841A-E5798E62761D}.Release|x86.ActiveCfg = Release|x86 - {F2065381-1265-4FEB-841A-E5798E62761D}.Release|x86.Build.0 = Release|x86 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|Any CPU.ActiveCfg = Debug|x64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|Any CPU.Build.0 = Debug|x64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|Any CPU.Deploy.0 = Debug|x64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|ARM.ActiveCfg = Debug|x86 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|ARM.Build.0 = Debug|x86 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|ARM.Deploy.0 = Debug|x86 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|ARM64.ActiveCfg = Debug|arm64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|ARM64.Build.0 = Debug|arm64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|ARM64.Deploy.0 = Debug|arm64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|x64.ActiveCfg = Debug|x64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|x64.Build.0 = Debug|x64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|x64.Deploy.0 = Debug|x64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|x86.ActiveCfg = Debug|x86 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|x86.Build.0 = Debug|x86 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|x86.Deploy.0 = Debug|x86 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|Any CPU.ActiveCfg = Release|x64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|Any CPU.Build.0 = Release|x64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|Any CPU.Deploy.0 = Release|x64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|ARM.ActiveCfg = Release|x64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|ARM.Build.0 = Release|x64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|ARM.Deploy.0 = Release|x64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|ARM64.ActiveCfg = Release|arm64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|ARM64.Build.0 = Release|arm64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|ARM64.Deploy.0 = Release|arm64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|x64.ActiveCfg = Release|x64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|x64.Build.0 = Release|x64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|x64.Deploy.0 = Release|x64 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|x86.ActiveCfg = Release|x86 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|x86.Build.0 = Release|x86 - {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|x86.Deploy.0 = Release|x86 - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Debug|ARM.ActiveCfg = Debug|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Debug|ARM.Build.0 = Debug|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Debug|ARM64.Build.0 = Debug|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Debug|x64.ActiveCfg = Debug|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Debug|x64.Build.0 = Debug|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Debug|x86.ActiveCfg = Debug|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Debug|x86.Build.0 = Debug|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|Any CPU.Build.0 = Release|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|ARM.ActiveCfg = Release|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|ARM.Build.0 = Release|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|ARM64.ActiveCfg = Release|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|ARM64.Build.0 = Release|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|x64.ActiveCfg = Release|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|x64.Build.0 = Release|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|x86.ActiveCfg = Release|Any CPU - {7FAC2A8B-C2EF-47FA-9598-FB2B414A7156}.Release|x86.Build.0 = Release|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Debug|ARM.ActiveCfg = Debug|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Debug|ARM.Build.0 = Debug|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Debug|ARM64.Build.0 = Debug|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Debug|x64.ActiveCfg = Debug|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Debug|x64.Build.0 = Debug|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Debug|x86.ActiveCfg = Debug|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Debug|x86.Build.0 = Debug|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Release|Any CPU.ActiveCfg = Release|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Release|Any CPU.Build.0 = Release|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Release|ARM.ActiveCfg = Release|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Release|ARM.Build.0 = Release|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Release|ARM64.ActiveCfg = Release|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Release|ARM64.Build.0 = Release|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Release|x64.ActiveCfg = Release|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Release|x64.Build.0 = Release|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Release|x86.ActiveCfg = Release|Any CPU - {13795E09-8131-4716-9EBC-970952E9F360}.Release|x86.Build.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Release|Any CPU.Build.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Release|Any CPU.Deploy.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {4830E5AF-9C61-4A32-B34F-82CF4072248B} + SolutionGuid = {4D769F43-A252-4DC4-B54B-055DBC12610B} EndGlobalSection EndGlobal diff --git a/Emerald/App.xaml b/Emerald/App.xaml new file mode 100644 index 00000000..eb80f398 --- /dev/null +++ b/Emerald/App.xaml @@ -0,0 +1,19 @@ +<Application x:Class="Emerald.App" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:utum="using:Uno.Toolkit.UI.Material"> + + <Application.Resources> + <ResourceDictionary> + <ResourceDictionary.MergedDictionaries> + <!-- Load WinUI resources --> + <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" /> + <!-- Load Uno.UI.Toolkit resources --> + <ToolkitResources xmlns="using:Uno.Toolkit.UI" /> + </ResourceDictionary.MergedDictionaries> + </ResourceDictionary> + </Application.Resources> + + <!-- Add resources here --> + +</Application> diff --git a/Emerald/App.xaml.cs b/Emerald/App.xaml.cs new file mode 100644 index 00000000..25e5d31b --- /dev/null +++ b/Emerald/App.xaml.cs @@ -0,0 +1,62 @@ +using Uno.Resizetizer; + +namespace Emerald; +public partial class App : Application +{ + /// <summary> + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// </summary> + public App() + { + this.InitializeComponent(); + } + + protected Window? MainWindow { get; private set; } + protected IHost? Host { get; private set; } + + protected override void OnLaunched(LaunchActivatedEventArgs args) + { + var builder = this.CreateBuilder(args) + .Configure(host => host +#if DEBUG + // Switch to Development environment when running in DEBUG + .UseEnvironment(Environments.Development) +#endif + .ConfigureServices((context, services) => + { + // TODO: Register your services + //services.AddSingleton<IMyService, MyService>(); + }) + ); + MainWindow = builder.Window; + +#if DEBUG + MainWindow.EnableHotReload(); +#endif + MainWindow.SetWindowIcon(); + + Host = builder.Build(); + + // Do not repeat app initialization when the Window already has content, + // just ensure that the window is active + if (MainWindow.Content is not Frame rootFrame) + { + // Create a Frame to act as the navigation context and navigate to the first page + rootFrame = new Frame(); + + // Place the frame in the current Window + MainWindow.Content = rootFrame; + } + + if (rootFrame.Content == null) + { + // When the navigation stack isn't restored navigate to the first page, + // configuring the new page by passing required information as a navigation + // parameter + rootFrame.Navigate(typeof(MainPage), args.Arguments); + } + // Ensure the current window is active + MainWindow.Activate(); + } +} diff --git a/Emerald/Assets/Icons/icon.svg b/Emerald/Assets/Icons/icon.svg new file mode 100644 index 00000000..a15af53a --- /dev/null +++ b/Emerald/Assets/Icons/icon.svg @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + width="456" + height="456" + viewBox="0 0 456 456" + version="1.1" + id="svg453" + sodipodi:docname="icon.svg" + inkscape:version="1.2 (dc2aedaf03, 2022-05-15)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <defs + id="defs457" /> + <sodipodi:namedview + id="namedview455" + pagecolor="#ffffff" + bordercolor="#000000" + borderopacity="0.25" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="1.8574561" + inkscape:cx="228.26919" + inkscape:cy="228.26919" + inkscape:window-width="1920" + inkscape:window-height="1027" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:current-layer="svg453" /> + <rect + x="0" + y="0" + width="456" + height="456" + fill="#FFFFFF" + id="rect451" /> +</svg> diff --git a/Emerald/Assets/Icons/icon_foreground.svg b/Emerald/Assets/Icons/icon_foreground.svg new file mode 100644 index 00000000..8ffc41ae --- /dev/null +++ b/Emerald/Assets/Icons/icon_foreground.svg @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + width="450" + height="450" + viewBox="0 0 50.369617 49.826836" + version="1.1" + id="svg151" + sodipodi:docname="icon_foreground.svg" + inkscape:version="1.2 (dc2aedaf03, 2022-05-15)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview153" + pagecolor="#ffffff" + bordercolor="#000000" + borderopacity="0.25" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="1.250876" + inkscape:cx="218.64677" + inkscape:cy="175.87674" + inkscape:window-width="1920" + inkscape:window-height="1027" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:current-layer="g149" /> + <defs + id="defs105"> + <path + id="aj28a0fd1a" + d="M 1.738,0.156 3.927,2.323 2.347,3.919 0.101,1.81 Z" /> + <path + id="fdje57jgic" + d="M 2.201,0.066 3.855,1.703 1.69,3.894 0.093,2.311 Z" /> + <path + id="6bg72xwlze" + d="M 2.398,0.044 3.994,1.624 1.886,3.869 0.232,2.232 Z" /> + <path + id="eaqjnja8wg" + d="M 1.736,0.023 3.981,2.132 2.344,3.786 0.156,1.619 Z" /> + </defs> + <g + fill="none" + fill-rule="evenodd" + id="g149" + transform="translate(-2.9304427e-4,-1.6465461e-4)"> + <g + id="g147"> + <g + id="g145"> + <path + fill="#7a67f8" + d="M 34.758,38.865 H 34.746 C 31.892,38.86 29.342,36.882 26.152,33.692 l -6.93,-6.873 2.166,-2.188 6.937,6.88 c 3.075,3.074 4.876,4.272 6.427,4.275 h 0.005 c 1.567,0 3.467,-1.262 6.558,-4.353 l 3.541,-3.587 c 1.784,-1.784 2.57,-3.34 2.408,-4.762 -0.13,-1.156 -0.894,-2.397 -2.401,-3.904 L 44.83,19.146 C 43.202,17.414 41.211,15.483 39.131,14.414 38.745,12.437 37.48,10.881 37.3,10.596 c 3.803,0.559 7.197,3.703 9.758,6.424 2.788,2.794 5.803,7.176 -0.018,12.996 l -3.54,3.588 c -3.251,3.25 -5.844,5.261 -8.742,5.261" + id="path107" /> + <path + fill="#f85977" + d="m 25.399,28.608 6.492,-6.562 c 3.076,-3.076 4.274,-4.877 4.276,-6.428 0.004,-1.567 -1.257,-3.469 -4.352,-6.563 L 28.228,5.515 C 24.58,1.867 22.369,2.699 19.561,5.507 L 19.528,5.54 c -1.54,1.448 -3.237,3.182 -4.346,5.01 -1.031,0.073 -2.361,0.424 -3.997,1.518 0.906,-3.397 3.737,-6.422 6.216,-8.755 2.794,-2.789 7.177,-5.804 12.997,0.017 l 3.588,3.54 c 3.255,3.256 5.266,5.851 5.26,8.754 -0.005,2.854 -1.982,5.404 -5.172,8.594 l -6.489,6.559 z" + id="path109" /> + <path + fill="#159bff" + d="M 12.522,38.707 C 8.939,37.946 5.746,34.972 3.308,32.382 2.035,31.106 0.321,29.13 0.042,26.663 c -0.274,-2.414 0.8,-4.795 3.283,-7.278 l 3.542,-3.588 c 3.25,-3.25 5.843,-5.261 8.74,-5.261 h 0.013 c 2.854,0.005 5.404,1.983 8.593,5.172 l 7.046,6.976 -2.165,2.19 -7.053,-6.983 c -3.076,-3.076 -4.876,-4.273 -6.427,-4.276 h -0.006 c -1.566,0 -3.466,1.261 -6.557,4.352 L 5.51,21.555 c -1.784,1.784 -2.57,3.34 -2.409,4.762 0.131,1.156 0.894,2.396 2.402,3.904 l 0.033,0.034 c 1.55,1.649 3.43,3.479 5.401,4.573 0.168,1.739 1.2,3.297 1.585,3.88" + id="path111" /> + <path + fill="#67e5ad" + d="m 26.32,49.827 c -1.925,0 -4.114,-0.886 -6.557,-3.33 l -3.588,-3.54 C 9.167,35.949 9.151,32.546 16.086,25.61 l 6.802,-6.872 2.193,2.162 -6.812,6.882 c -3.076,3.076 -4.273,4.877 -4.276,6.427 -0.003,1.568 1.258,3.47 4.352,6.563 l 3.588,3.541 c 3.646,3.647 5.858,2.816 8.666,0.008 l 0.034,-0.033 c 1.654,-1.555 3.5,-3.46 4.593,-5.437 1.661,-0.14 2.9,-0.841 3.835,-1.438 -0.8,3.537 -3.738,6.69 -6.302,9.102 -1.62,1.618 -3.777,3.312 -6.439,3.312" + id="path113" /> + <g + transform="translate(21.154,18.577)" + id="g120"> + <mask + id="8jptpqrneb" + fill="#ffffff"> + <use + xlink:href="#aj28a0fd1a" + id="use115" /> + </mask> + <path + d="M 0.101,1.81 1.738,0.156 3.927,2.323 2.347,3.919 Z" + mask="url(#8jptpqrneb)" + id="path118" /> + </g> + <g + transform="translate(27.404,20.981)" + id="g127"> + <mask + id="b2iljpfwbd" + fill="#ffffff"> + <use + xlink:href="#fdje57jgic" + id="use122" /> + </mask> + <path + d="M 2.201,0.066 3.855,1.703 1.69,3.894 0.093,2.311 Z" + mask="url(#b2iljpfwbd)" + id="path125" /> + </g> + <g + transform="translate(18.99,24.587)" + id="g134"> + <mask + id="gj70tyfpnf" + fill="#ffffff"> + <use + xlink:href="#6bg72xwlze" + id="use129" /> + </mask> + <path + d="M 1.886,3.869 0.232,2.232 2.398,0.044 3.994,1.624 Z" + mask="url(#gj70tyfpnf)" + id="path132" /> + </g> + <g + transform="translate(25.24,26.99)" + id="g141"> + <mask + id="z7vhvduckh" + fill="#ffffff"> + <use + xlink:href="#eaqjnja8wg" + id="use136" /> + </mask> + <path + d="M 3.981,2.132 2.344,3.786 0.156,1.619 1.736,0.023 Z" + mask="url(#z7vhvduckh)" + id="path139" /> + </g> + </g> + </g> + </g> +</svg> diff --git a/Emerald/Assets/SharedAssets.md b/Emerald/Assets/SharedAssets.md new file mode 100644 index 00000000..1b84a74a --- /dev/null +++ b/Emerald/Assets/SharedAssets.md @@ -0,0 +1,32 @@ +# Shared Assets + +See documentation about assets here: https://github.com/unoplatform/uno/blob/master/doc/articles/features/working-with-assets.md + +## Here is a cheat sheet + +1. Add the image file to the `Assets` directory of a shared project. +2. Set the build action to `Content`. +3. (Recommended) Provide an asset for various scales/dpi + +### Examples + +```text +\Assets\Images\logo.scale-100.png +\Assets\Images\logo.scale-200.png +\Assets\Images\logo.scale-400.png + +\Assets\Images\scale-100\logo.png +\Assets\Images\scale-200\logo.png +\Assets\Images\scale-400\logo.png +``` + +### Table of scales + +| Scale | WinUI | iOS/MacCatalyst | Android | +|-------|:-----------:|:---------------:|:-------:| +| `100` | scale-100 | @1x | mdpi | +| `125` | scale-125 | N/A | N/A | +| `150` | scale-150 | N/A | hdpi | +| `200` | scale-200 | @2x | xhdpi | +| `300` | scale-300 | @3x | xxhdpi | +| `400` | scale-400 | N/A | xxxhdpi | diff --git a/Emerald/Assets/Splash/splash_screen.svg b/Emerald/Assets/Splash/splash_screen.svg new file mode 100644 index 00000000..8ffc41ae --- /dev/null +++ b/Emerald/Assets/Splash/splash_screen.svg @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + width="450" + height="450" + viewBox="0 0 50.369617 49.826836" + version="1.1" + id="svg151" + sodipodi:docname="icon_foreground.svg" + inkscape:version="1.2 (dc2aedaf03, 2022-05-15)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview153" + pagecolor="#ffffff" + bordercolor="#000000" + borderopacity="0.25" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="1.250876" + inkscape:cx="218.64677" + inkscape:cy="175.87674" + inkscape:window-width="1920" + inkscape:window-height="1027" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1" + inkscape:current-layer="g149" /> + <defs + id="defs105"> + <path + id="aj28a0fd1a" + d="M 1.738,0.156 3.927,2.323 2.347,3.919 0.101,1.81 Z" /> + <path + id="fdje57jgic" + d="M 2.201,0.066 3.855,1.703 1.69,3.894 0.093,2.311 Z" /> + <path + id="6bg72xwlze" + d="M 2.398,0.044 3.994,1.624 1.886,3.869 0.232,2.232 Z" /> + <path + id="eaqjnja8wg" + d="M 1.736,0.023 3.981,2.132 2.344,3.786 0.156,1.619 Z" /> + </defs> + <g + fill="none" + fill-rule="evenodd" + id="g149" + transform="translate(-2.9304427e-4,-1.6465461e-4)"> + <g + id="g147"> + <g + id="g145"> + <path + fill="#7a67f8" + d="M 34.758,38.865 H 34.746 C 31.892,38.86 29.342,36.882 26.152,33.692 l -6.93,-6.873 2.166,-2.188 6.937,6.88 c 3.075,3.074 4.876,4.272 6.427,4.275 h 0.005 c 1.567,0 3.467,-1.262 6.558,-4.353 l 3.541,-3.587 c 1.784,-1.784 2.57,-3.34 2.408,-4.762 -0.13,-1.156 -0.894,-2.397 -2.401,-3.904 L 44.83,19.146 C 43.202,17.414 41.211,15.483 39.131,14.414 38.745,12.437 37.48,10.881 37.3,10.596 c 3.803,0.559 7.197,3.703 9.758,6.424 2.788,2.794 5.803,7.176 -0.018,12.996 l -3.54,3.588 c -3.251,3.25 -5.844,5.261 -8.742,5.261" + id="path107" /> + <path + fill="#f85977" + d="m 25.399,28.608 6.492,-6.562 c 3.076,-3.076 4.274,-4.877 4.276,-6.428 0.004,-1.567 -1.257,-3.469 -4.352,-6.563 L 28.228,5.515 C 24.58,1.867 22.369,2.699 19.561,5.507 L 19.528,5.54 c -1.54,1.448 -3.237,3.182 -4.346,5.01 -1.031,0.073 -2.361,0.424 -3.997,1.518 0.906,-3.397 3.737,-6.422 6.216,-8.755 2.794,-2.789 7.177,-5.804 12.997,0.017 l 3.588,3.54 c 3.255,3.256 5.266,5.851 5.26,8.754 -0.005,2.854 -1.982,5.404 -5.172,8.594 l -6.489,6.559 z" + id="path109" /> + <path + fill="#159bff" + d="M 12.522,38.707 C 8.939,37.946 5.746,34.972 3.308,32.382 2.035,31.106 0.321,29.13 0.042,26.663 c -0.274,-2.414 0.8,-4.795 3.283,-7.278 l 3.542,-3.588 c 3.25,-3.25 5.843,-5.261 8.74,-5.261 h 0.013 c 2.854,0.005 5.404,1.983 8.593,5.172 l 7.046,6.976 -2.165,2.19 -7.053,-6.983 c -3.076,-3.076 -4.876,-4.273 -6.427,-4.276 h -0.006 c -1.566,0 -3.466,1.261 -6.557,4.352 L 5.51,21.555 c -1.784,1.784 -2.57,3.34 -2.409,4.762 0.131,1.156 0.894,2.396 2.402,3.904 l 0.033,0.034 c 1.55,1.649 3.43,3.479 5.401,4.573 0.168,1.739 1.2,3.297 1.585,3.88" + id="path111" /> + <path + fill="#67e5ad" + d="m 26.32,49.827 c -1.925,0 -4.114,-0.886 -6.557,-3.33 l -3.588,-3.54 C 9.167,35.949 9.151,32.546 16.086,25.61 l 6.802,-6.872 2.193,2.162 -6.812,6.882 c -3.076,3.076 -4.273,4.877 -4.276,6.427 -0.003,1.568 1.258,3.47 4.352,6.563 l 3.588,3.541 c 3.646,3.647 5.858,2.816 8.666,0.008 l 0.034,-0.033 c 1.654,-1.555 3.5,-3.46 4.593,-5.437 1.661,-0.14 2.9,-0.841 3.835,-1.438 -0.8,3.537 -3.738,6.69 -6.302,9.102 -1.62,1.618 -3.777,3.312 -6.439,3.312" + id="path113" /> + <g + transform="translate(21.154,18.577)" + id="g120"> + <mask + id="8jptpqrneb" + fill="#ffffff"> + <use + xlink:href="#aj28a0fd1a" + id="use115" /> + </mask> + <path + d="M 0.101,1.81 1.738,0.156 3.927,2.323 2.347,3.919 Z" + mask="url(#8jptpqrneb)" + id="path118" /> + </g> + <g + transform="translate(27.404,20.981)" + id="g127"> + <mask + id="b2iljpfwbd" + fill="#ffffff"> + <use + xlink:href="#fdje57jgic" + id="use122" /> + </mask> + <path + d="M 2.201,0.066 3.855,1.703 1.69,3.894 0.093,2.311 Z" + mask="url(#b2iljpfwbd)" + id="path125" /> + </g> + <g + transform="translate(18.99,24.587)" + id="g134"> + <mask + id="gj70tyfpnf" + fill="#ffffff"> + <use + xlink:href="#6bg72xwlze" + id="use129" /> + </mask> + <path + d="M 1.886,3.869 0.232,2.232 2.398,0.044 3.994,1.624 Z" + mask="url(#gj70tyfpnf)" + id="path132" /> + </g> + <g + transform="translate(25.24,26.99)" + id="g141"> + <mask + id="z7vhvduckh" + fill="#ffffff"> + <use + xlink:href="#eaqjnja8wg" + id="use136" /> + </mask> + <path + d="M 3.981,2.132 2.344,3.786 0.156,1.619 1.736,0.023 Z" + mask="url(#z7vhvduckh)" + id="path139" /> + </g> + </g> + </g> + </g> +</svg> diff --git a/Emerald/Emerald.csproj b/Emerald/Emerald.csproj new file mode 100644 index 00000000..5c40cad7 --- /dev/null +++ b/Emerald/Emerald.csproj @@ -0,0 +1,44 @@ +<Project Sdk="Uno.Sdk"> + <PropertyGroup> + <TargetFrameworks> + net8.0-maccatalyst; + net8.0-windows10.0.19041; + net8.0-desktop; + </TargetFrameworks> + + <OutputType>Exe</OutputType> + <UnoSingleProject>true</UnoSingleProject> + + <!-- Display name --> + <ApplicationTitle>Emerald</ApplicationTitle> + <!-- App Identifier --> + <ApplicationId>Riverside.Emerald</ApplicationId> + <!-- Versions --> + <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion> + <ApplicationVersion>1</ApplicationVersion> + <!-- + If you encounter this error message: + + error NETSDK1148: A referenced assembly was compiled using a newer version of Microsoft.Windows.SDK.NET.dll. + Please update to a newer .NET SDK in order to reference this assembly. + + This means that the two packages below must be aligned with the "build" version number of + the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number + must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref. + --> + <!-- <WindowsSdkPackageVersion>10.0.22621.28</WindowsSdkPackageVersion> --> + + <!-- + UnoFeatures let's you quickly add and manage implicit package references based on the features you want to use. + https://aka.platform.uno/singleproject-features + --> + <UnoFeatures> + Lottie; + Hosting; + Toolkit; + Mvvm; + ThemeService; + </UnoFeatures> + </PropertyGroup> + +</Project> diff --git a/Emerald/GlobalUsings.cs b/Emerald/GlobalUsings.cs new file mode 100644 index 00000000..6b345c18 --- /dev/null +++ b/Emerald/GlobalUsings.cs @@ -0,0 +1,7 @@ +global using System.Collections.Immutable; +global using CommunityToolkit.Mvvm.ComponentModel; +global using CommunityToolkit.Mvvm.Input; +global using Microsoft.Extensions.DependencyInjection; +global using Microsoft.Extensions.Hosting; +global using Microsoft.Extensions.Logging; +global using ApplicationExecutionState = Windows.ApplicationModel.Activation.ApplicationExecutionState; diff --git a/Emerald/MainPage.xaml b/Emerald/MainPage.xaml new file mode 100644 index 00000000..7145924d --- /dev/null +++ b/Emerald/MainPage.xaml @@ -0,0 +1,14 @@ +<Page x:Class="Emerald.MainPage" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:Emerald" + xmlns:utu="using:Uno.Toolkit.UI" + Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> + <StackPanel utu:SafeArea.Insets="VisibleBounds" + HorizontalAlignment="Center" + VerticalAlignment="Center"> + <TextBlock AutomationProperties.AutomationId="HelloTextBlock" + Text="Hello Uno Platform" + HorizontalAlignment="Center" /> + </StackPanel> +</Page> diff --git a/Emerald/MainPage.xaml.cs b/Emerald/MainPage.xaml.cs new file mode 100644 index 00000000..f7f1791c --- /dev/null +++ b/Emerald/MainPage.xaml.cs @@ -0,0 +1,9 @@ +namespace Emerald; + +public sealed partial class MainPage : Page +{ + public MainPage() + { + this.InitializeComponent(); + } +} diff --git a/Emerald/Package.appxmanifest b/Emerald/Package.appxmanifest new file mode 100644 index 00000000..29558f1d --- /dev/null +++ b/Emerald/Package.appxmanifest @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> + +<Package + xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" + xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" + xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" + IgnorableNamespaces="uap rescap"> + + <Identity + Name="Emerald" + Publisher="O=Riverside Valley" + Version="1.0.0.0" /> + + <Properties> + <DisplayName>Emerald</DisplayName> + <PublisherDisplayName>Emerald</PublisherDisplayName> + </Properties> + + <Dependencies> + <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" /> + <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" /> + </Dependencies> + + <Resources> + <Resource Language="x-generate"/> + </Resources> + + <Applications> + <Application Id="App" + Executable="$targetnametoken$.exe" + EntryPoint="$targetentrypoint$"> + <uap:VisualElements + DisplayName="Emerald" + Description="Emerald"> + <uap:SplashScreen /> + </uap:VisualElements> + </Application> + </Applications> + + <Capabilities> + <rescap:Capability Name="runFullTrust" /> + </Capabilities> +</Package> diff --git a/Emerald/Platforms/Desktop/Program.cs b/Emerald/Platforms/Desktop/Program.cs new file mode 100644 index 00000000..505e2c1b --- /dev/null +++ b/Emerald/Platforms/Desktop/Program.cs @@ -0,0 +1,19 @@ +using Uno.UI.Runtime.Skia; + +namespace Emerald; +public class Program +{ + [STAThread] + public static void Main(string[] args) + { + var host = SkiaHostBuilder.Create() + .App(() => new App()) + .UseX11() + .UseLinuxFrameBuffer() + .UseMacOS() + .UseWindows() + .Build(); + + host.Run(); + } +} diff --git a/Emerald/Platforms/MacCatalyst/Entitlements.plist b/Emerald/Platforms/MacCatalyst/Entitlements.plist new file mode 100644 index 00000000..24c31036 --- /dev/null +++ b/Emerald/Platforms/MacCatalyst/Entitlements.plist @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> + <dict> + </dict> +</plist> diff --git a/Emerald/Platforms/MacCatalyst/Info.plist b/Emerald/Platforms/MacCatalyst/Info.plist new file mode 100644 index 00000000..1bb02ddc --- /dev/null +++ b/Emerald/Platforms/MacCatalyst/Info.plist @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> + <dict> + <key>UIDeviceFamily</key> + <array> + <integer>2</integer> + </array> + <key>LSApplicationCategoryType</key> + <string>public.app-category.utilities</string> + <key>UISupportedInterfaceOrientations</key> + <array> + <string>UIInterfaceOrientationPortrait</string> + <string>UIInterfaceOrientationLandscapeLeft</string> + <string>UIInterfaceOrientationLandscapeRight</string> + </array> + <key>XSAppIconAssets</key> + <string>Assets.xcassets/icon.appiconset</string> + + <!-- + Adjust this to your application's encryption usage. + <key>ITSAppUsesNonExemptEncryption</key> + <false/> + --> + </dict> +</plist> diff --git a/Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs b/Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs new file mode 100644 index 00000000..d26d16e3 --- /dev/null +++ b/Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs @@ -0,0 +1,13 @@ +using UIKit; + +namespace Emerald.MacCatalyst; +public class EntryPoint +{ + // This is the main entry point of the application. + public static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(App)); + } +} diff --git a/Emerald/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json b/Emerald/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json new file mode 100644 index 00000000..69555e44 --- /dev/null +++ b/Emerald/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json @@ -0,0 +1,58 @@ +{ + "images": [ + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "640x960", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "subtype": "retina4", + "scale": "2x", + "size": "640x1136", + "idiom": "iphone" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "768x1024", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "1x", + "size": "1024x768", + "idiom": "ipad" + }, + { + "orientation": "portrait", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "1536x2048", + "idiom": "ipad" + }, + { + "orientation": "landscape", + "extent": "full-screen", + "minimum-system-version": "7.0", + "scale": "2x", + "size": "2048x1536", + "idiom": "ipad" + } + ], + "properties": {}, + "info": { + "version": 1, + "author": "" + } +} \ No newline at end of file diff --git a/Emerald/Platforms/Windows/Properties/PublishProfiles/win-arm64.pubxml b/Emerald/Platforms/Windows/Properties/PublishProfiles/win-arm64.pubxml new file mode 100644 index 00000000..d5147f10 --- /dev/null +++ b/Emerald/Platforms/Windows/Properties/PublishProfiles/win-arm64.pubxml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +https://go.microsoft.com/fwlink/?LinkID=208121. +--> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <PublishProtocol>FileSystem</PublishProtocol> + <Platform>arm64</Platform> + <RuntimeIdentifier>win-arm64</RuntimeIdentifier> + <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir> + <SelfContained>true</SelfContained> + <PublishSingleFile>False</PublishSingleFile> + <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun> + <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun> + <!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 --> + <!-- + <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed> + <TrimMode>partial</TrimMode> + <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings> + --> + </PropertyGroup> +</Project> diff --git a/Emerald/Platforms/Windows/Properties/PublishProfiles/win-x64.pubxml b/Emerald/Platforms/Windows/Properties/PublishProfiles/win-x64.pubxml new file mode 100644 index 00000000..4fea954e --- /dev/null +++ b/Emerald/Platforms/Windows/Properties/PublishProfiles/win-x64.pubxml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +https://go.microsoft.com/fwlink/?LinkID=208121. +--> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <PublishProtocol>FileSystem</PublishProtocol> + <Platform>x64</Platform> + <RuntimeIdentifier>win-x64</RuntimeIdentifier> + <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir> + <SelfContained>true</SelfContained> + <PublishSingleFile>False</PublishSingleFile> + <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun> + <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun> + <!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 --> + <!-- + <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed> + <TrimMode>partial</TrimMode> + <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings> + --> + </PropertyGroup> +</Project> diff --git a/Emerald/Platforms/Windows/Properties/PublishProfiles/win-x86.pubxml b/Emerald/Platforms/Windows/Properties/PublishProfiles/win-x86.pubxml new file mode 100644 index 00000000..928cb25e --- /dev/null +++ b/Emerald/Platforms/Windows/Properties/PublishProfiles/win-x86.pubxml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +https://go.microsoft.com/fwlink/?LinkID=208121. +--> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <PublishProtocol>FileSystem</PublishProtocol> + <Platform>x86</Platform> + <RuntimeIdentifier>win-x86</RuntimeIdentifier> + <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir> + <SelfContained>true</SelfContained> + <PublishSingleFile>False</PublishSingleFile> + <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun> + <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun> + <!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 --> + <!-- + <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed> + <TrimMode>partial</TrimMode> + <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings> + --> + </PropertyGroup> +</Project> diff --git a/Emerald/Properties/launchSettings.json b/Emerald/Properties/launchSettings.json new file mode 100644 index 00000000..a8c8aed9 --- /dev/null +++ b/Emerald/Properties/launchSettings.json @@ -0,0 +1,31 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:8080", + "sslPort": 0 + } + }, + "profiles": { + // Note: In order to select this profile, you'll need to comment the `Packaged` profile below until this is fixed: https://aka.platform.uno/wasdk-maui-debug-profile-issue + "Emerald (WinAppSDK Unpackaged)": { + "commandName": "Project", + "compatibleTargetFramework": "windows" + }, + "Emerald (WinAppSDK Packaged)": { + "commandName": "MsixPackage", + "compatibleTargetFramework": "windows" + }, + "Emerald (Desktop)": { + "commandName": "Project", + "compatibleTargetFramework": "desktop" + }, + "Emerald (Desktop WSL2)": { + "commandName": "WSL2", + "commandLineArgs": "{ProjectDir}/bin/Debug/net8.0-desktop/Emerald.dll", + "distributionName": "", + "compatibleTargetFramework": "desktop" + } + } +} diff --git a/Emerald/ReadMe.md b/Emerald/ReadMe.md new file mode 100644 index 00000000..93482da2 --- /dev/null +++ b/Emerald/ReadMe.md @@ -0,0 +1,7 @@ +# Getting Started + +Welcome to the Uno Platform! + +To discover how to get started with your new app: https://aka.platform.uno/get-started + +For more information on how to use the Uno.Sdk or upgrade Uno Platform packages in your solution: https://aka.platform.uno/using-uno-sdk \ No newline at end of file diff --git a/Emerald/Strings/en/Resources.resw b/Emerald/Strings/en/Resources.resw new file mode 100644 index 00000000..a311865f --- /dev/null +++ b/Emerald/Strings/en/Resources.resw @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <data name="ApplicationName" xml:space="preserve"> + <value>Emerald-en</value> + </data> +</root> diff --git a/Emerald/app.manifest b/Emerald/app.manifest new file mode 100644 index 00000000..7c69768c --- /dev/null +++ b/Emerald/app.manifest @@ -0,0 +1,25 @@ +<?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="Emerald.Windows.app"/> + + <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> + <!--The ID below informs the system that this application is compatible with OS features first introduced in Windows 8. + For more info see https://docs.microsoft.com/windows/win32/sysinfo/targeting-your-application-at-windows-8-1 + + It is also necessary to support features in unpackaged applications, for example the custom titlebar implementation.--> + <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" /> + </application> + </compatibility> + + <application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <!-- The combination of below two tags have the following effect: + 1) Per-Monitor for >= Windows 10 Anniversary Update + 2) System < Windows 10 Anniversary Update + --> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware> + <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness> + </windowsSettings> + </application> +</assembly> diff --git a/global.json b/global.json new file mode 100644 index 00000000..ce7228cb --- /dev/null +++ b/global.json @@ -0,0 +1,9 @@ +{ + // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information. + "msbuild-sdks": { + "Uno.Sdk": "5.2.175" + }, + "sdk": { + "allowPrerelease": false + } +} From 4cce0a38c9f66265d6676befbfe1cd127cf248c8 Mon Sep 17 00:00:00 2001 From: Lamparter <notlamparter@outlook.com> Date: Thu, 18 Jul 2024 17:53:06 +0100 Subject: [PATCH 21/61] Rename CI Signed-off-by: Lamparter <notlamparter@outlook.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3796bf27..1e85087f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ env: jobs: smoke_test: - name: Smoke Test (Debug Build of Emerald) + name: Emerald CI / Debug runs-on: windows-latest steps: - uses: actions/checkout@v3 From 3859bb109be491e1ed51702cc5c7a5c28633e631 Mon Sep 17 00:00:00 2001 From: Lamparter <notlamparter@outlook.com> Date: Thu, 18 Jul 2024 17:58:29 +0100 Subject: [PATCH 22/61] Modify solution to include projects --- Emerald.sln | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 1 deletion(-) diff --git a/Emerald.sln b/Emerald.sln index c11b44ea..bb5184e0 100644 --- a/Emerald.sln +++ b/Emerald.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.11.35103.136 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emerald", "Emerald\Emerald.csproj", "{9D3213F4-E514-4E7D-872A-725DB4872436}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emerald", "Emerald\Emerald.csproj", "{9D3213F4-E514-4E7D-872A-725DB4872436}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3142BDF3-E95C-4F0F-8701-CF981F6EA3C0}" ProjectSection(SolutionItems) = preProject @@ -14,18 +14,174 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution global.json = global.json EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emerald.App", "Emerald.App\Emerald.App\Emerald.App.csproj", "{196FD412-FCBA-4266-A75E-5648F6AADDFB}" +EndProject +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Package.WinUI", "Emerald.App\Emerald.App.Package\Package.WinUI.wapproj", "{59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emerald.Core", "Emerald.Core\Emerald.Core.csproj", "{BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emerald.CoreX", "Emerald.CoreX\Emerald.CoreX.csproj", "{D103EFF9-90EA-49C7-9DD9-636E6056E9C3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|arm64 = Debug|arm64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|arm64 = Release|arm64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + SkipOld|Any CPU = SkipOld|Any CPU + SkipOld|arm64 = SkipOld|arm64 + SkipOld|x64 = SkipOld|x64 + SkipOld|x86 = SkipOld|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {9D3213F4-E514-4E7D-872A-725DB4872436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9D3213F4-E514-4E7D-872A-725DB4872436}.Debug|Any CPU.Build.0 = Debug|Any CPU {9D3213F4-E514-4E7D-872A-725DB4872436}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Debug|arm64.ActiveCfg = Debug|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Debug|arm64.Build.0 = Debug|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Debug|arm64.Deploy.0 = Debug|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Debug|x64.ActiveCfg = Debug|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Debug|x64.Build.0 = Debug|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Debug|x64.Deploy.0 = Debug|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Debug|x86.ActiveCfg = Debug|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Debug|x86.Build.0 = Debug|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Debug|x86.Deploy.0 = Debug|Any CPU {9D3213F4-E514-4E7D-872A-725DB4872436}.Release|Any CPU.ActiveCfg = Release|Any CPU {9D3213F4-E514-4E7D-872A-725DB4872436}.Release|Any CPU.Build.0 = Release|Any CPU {9D3213F4-E514-4E7D-872A-725DB4872436}.Release|Any CPU.Deploy.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Release|arm64.ActiveCfg = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Release|arm64.Build.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Release|arm64.Deploy.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Release|x64.ActiveCfg = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Release|x64.Build.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Release|x64.Deploy.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Release|x86.ActiveCfg = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Release|x86.Build.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.Release|x86.Deploy.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.SkipOld|Any CPU.ActiveCfg = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.SkipOld|Any CPU.Build.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.SkipOld|Any CPU.Deploy.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.SkipOld|arm64.ActiveCfg = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.SkipOld|arm64.Build.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.SkipOld|arm64.Deploy.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.SkipOld|x64.ActiveCfg = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.SkipOld|x64.Build.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.SkipOld|x64.Deploy.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.SkipOld|x86.ActiveCfg = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.SkipOld|x86.Build.0 = Release|Any CPU + {9D3213F4-E514-4E7D-872A-725DB4872436}.SkipOld|x86.Deploy.0 = Release|Any CPU + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Debug|Any CPU.ActiveCfg = Debug|x64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Debug|Any CPU.Build.0 = Debug|x64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Debug|arm64.ActiveCfg = Debug|arm64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Debug|arm64.Build.0 = Debug|arm64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Debug|x64.ActiveCfg = Debug|x64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Debug|x64.Build.0 = Debug|x64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Debug|x86.ActiveCfg = Debug|x86 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Debug|x86.Build.0 = Debug|x86 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Release|Any CPU.ActiveCfg = Release|x64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Release|Any CPU.Build.0 = Release|x64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Release|arm64.ActiveCfg = Release|arm64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Release|arm64.Build.0 = Release|arm64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Release|x64.ActiveCfg = Release|x64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Release|x64.Build.0 = Release|x64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Release|x86.ActiveCfg = Release|x86 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.Release|x86.Build.0 = Release|x86 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.SkipOld|Any CPU.ActiveCfg = Debug|x64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.SkipOld|Any CPU.Build.0 = Debug|x64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.SkipOld|arm64.ActiveCfg = Debug|arm64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.SkipOld|arm64.Build.0 = Debug|arm64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.SkipOld|x64.ActiveCfg = Debug|x64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.SkipOld|x64.Build.0 = Debug|x64 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.SkipOld|x86.ActiveCfg = Debug|x86 + {196FD412-FCBA-4266-A75E-5648F6AADDFB}.SkipOld|x86.Build.0 = Debug|x86 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|Any CPU.ActiveCfg = Debug|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|Any CPU.Build.0 = Debug|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|Any CPU.Deploy.0 = Debug|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|arm64.ActiveCfg = Debug|arm64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|arm64.Build.0 = Debug|arm64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|arm64.Deploy.0 = Debug|arm64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|x64.ActiveCfg = Debug|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|x64.Build.0 = Debug|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|x64.Deploy.0 = Debug|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|x86.ActiveCfg = Debug|x86 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|x86.Build.0 = Debug|x86 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Debug|x86.Deploy.0 = Debug|x86 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|Any CPU.ActiveCfg = Release|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|Any CPU.Build.0 = Release|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|Any CPU.Deploy.0 = Release|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|arm64.ActiveCfg = Release|arm64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|arm64.Build.0 = Release|arm64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|arm64.Deploy.0 = Release|arm64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|x64.ActiveCfg = Release|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|x64.Build.0 = Release|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|x64.Deploy.0 = Release|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|x86.ActiveCfg = Release|x86 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|x86.Build.0 = Release|x86 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.Release|x86.Deploy.0 = Release|x86 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.SkipOld|Any CPU.ActiveCfg = SkipOld|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.SkipOld|Any CPU.Build.0 = SkipOld|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.SkipOld|Any CPU.Deploy.0 = SkipOld|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.SkipOld|arm64.ActiveCfg = SkipOld|arm64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.SkipOld|arm64.Build.0 = SkipOld|arm64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.SkipOld|arm64.Deploy.0 = SkipOld|arm64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.SkipOld|x64.ActiveCfg = SkipOld|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.SkipOld|x64.Build.0 = SkipOld|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.SkipOld|x64.Deploy.0 = SkipOld|x64 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.SkipOld|x86.ActiveCfg = SkipOld|x86 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.SkipOld|x86.Build.0 = SkipOld|x86 + {59A6F3D1-B6E1-48AD-80D3-215DF2791AC1}.SkipOld|x86.Deploy.0 = SkipOld|x86 + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Debug|arm64.ActiveCfg = Debug|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Debug|arm64.Build.0 = Debug|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Debug|x64.ActiveCfg = Debug|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Debug|x64.Build.0 = Debug|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Debug|x86.ActiveCfg = Debug|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Debug|x86.Build.0 = Debug|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Release|Any CPU.Build.0 = Release|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Release|arm64.ActiveCfg = Release|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Release|arm64.Build.0 = Release|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Release|x64.ActiveCfg = Release|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Release|x64.Build.0 = Release|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Release|x86.ActiveCfg = Release|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.Release|x86.Build.0 = Release|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.SkipOld|Any CPU.ActiveCfg = Debug|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.SkipOld|Any CPU.Build.0 = Debug|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.SkipOld|arm64.ActiveCfg = Debug|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.SkipOld|arm64.Build.0 = Debug|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.SkipOld|x64.ActiveCfg = Debug|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.SkipOld|x64.Build.0 = Debug|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.SkipOld|x86.ActiveCfg = Debug|Any CPU + {BE4AEE6B-3F2E-4FFB-940D-3E4916EAE913}.SkipOld|x86.Build.0 = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Debug|arm64.ActiveCfg = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Debug|arm64.Build.0 = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Debug|x64.ActiveCfg = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Debug|x64.Build.0 = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Debug|x86.ActiveCfg = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Debug|x86.Build.0 = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Release|Any CPU.Build.0 = Release|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Release|arm64.ActiveCfg = Release|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Release|arm64.Build.0 = Release|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Release|x64.ActiveCfg = Release|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Release|x64.Build.0 = Release|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Release|x86.ActiveCfg = Release|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.Release|x86.Build.0 = Release|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.SkipOld|Any CPU.ActiveCfg = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.SkipOld|Any CPU.Build.0 = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.SkipOld|arm64.ActiveCfg = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.SkipOld|arm64.Build.0 = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.SkipOld|x64.ActiveCfg = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.SkipOld|x64.Build.0 = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.SkipOld|x86.ActiveCfg = Debug|Any CPU + {D103EFF9-90EA-49C7-9DD9-636E6056E9C3}.SkipOld|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From e5313a58c90bb1290322733a6ba621e90623fb83 Mon Sep 17 00:00:00 2001 From: Lamparter <notlamparter@outlook.com> Date: Thu, 18 Jul 2024 18:03:25 +0100 Subject: [PATCH 23/61] Update gitignore --- .gitignore | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ef88c205..83a8eded 100644 --- a/.gitignore +++ b/.gitignore @@ -400,4 +400,11 @@ FodyWeavers.xsd # Single Target Config solution-config.props # Publish Profiles -!**/Properties/PublishProfiles/*.pubxml \ No newline at end of file +!**/Properties/PublishProfiles/*.pubxml + +# Azure Active Directory and GitHub OAUTH tokens +/Emerald.App/Emerald.App/MsalClientID.txt +/Emerald.Core/MsalClientID.txt +/Emerald.App/Emerald.App/GithubClientID.txt +Emerald.App/GithubClientID.txt +Emerald.App/MsalClientID.txt From 4a72c70ca9e0a5d641837c3c764d9ca33813ba84 Mon Sep 17 00:00:00 2001 From: Lamparter <notlamparter@outlook.com> Date: Thu, 18 Jul 2024 18:04:49 +0100 Subject: [PATCH 24/61] Rename CI (again) Signed-off-by: Lamparter <notlamparter@outlook.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1e85087f..a210dd57 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ env: jobs: smoke_test: - name: Emerald CI / Debug + name: Emerald CI / Uno (debug) runs-on: windows-latest steps: - uses: actions/checkout@v3 From e54b1964381bf971164e0d049fbb4e188939a4c0 Mon Sep 17 00:00:00 2001 From: Lamparter <notlamparter@outlook.com> Date: Thu, 18 Jul 2024 18:05:49 +0100 Subject: [PATCH 25/61] Rename CI (again again) Signed-off-by: Lamparter <notlamparter@outlook.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a210dd57..2396a608 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ env: jobs: smoke_test: - name: Emerald CI / Uno (debug) + name: Uno (debug) runs-on: windows-latest steps: - uses: actions/checkout@v3 From d0dd261a530cb83f2a73001677eda8c28ccbb990 Mon Sep 17 00:00:00 2001 From: Lamparter <notlamparter@outlook.com> Date: Thu, 18 Jul 2024 18:06:52 +0100 Subject: [PATCH 26/61] Rename CI (again again again) Signed-off-by: Lamparter <notlamparter@outlook.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2396a608..7f5b9cbf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ env: jobs: smoke_test: - name: Uno (debug) + name: Uno runs-on: windows-latest steps: - uses: actions/checkout@v3 From 71bb783edb879c1442d64fa36aef9c138f086d8a Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Thu, 8 Aug 2024 12:41:59 +0530 Subject: [PATCH 27/61] Completely modify the modrinth store managing system --- Emerald.CoreX/Emerald.CoreX.csproj | 5 +- .../Store/Modrinth/IMinecraftStore.cs | 18 ++ Emerald.CoreX/Store/Modrinth/JSON.cs | 211 ++++++++++++++++++ Emerald.CoreX/Store/Modrinth/ModrinthStore.cs | 188 ++++++++++++++++ .../Store/Modrinth/SearchSortOptions.cs | 15 ++ Emerald.CoreX/Store/Modrinth/Stores.cs | 148 ++++++++++++ 6 files changed, 584 insertions(+), 1 deletion(-) create mode 100644 Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs create mode 100644 Emerald.CoreX/Store/Modrinth/JSON.cs create mode 100644 Emerald.CoreX/Store/Modrinth/ModrinthStore.cs create mode 100644 Emerald.CoreX/Store/Modrinth/SearchSortOptions.cs create mode 100644 Emerald.CoreX/Store/Modrinth/Stores.cs diff --git a/Emerald.CoreX/Emerald.CoreX.csproj b/Emerald.CoreX/Emerald.CoreX.csproj index 367cd3d7..d875fd8b 100644 --- a/Emerald.CoreX/Emerald.CoreX.csproj +++ b/Emerald.CoreX/Emerald.CoreX.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <TargetFramework>net8.0</TargetFramework> @@ -11,5 +11,8 @@ <PackageReference Include="CmlLib.Core.Auth.Microsoft" Version="3.1.0" /> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" /> <PackageReference Include="ProjBobcat" Version="1.16.0" /> + <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.6.24327.7" /> + <PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> + <PackageReference Include="RestSharp" Version="111.4.1" /> </ItemGroup> </Project> \ No newline at end of file diff --git a/Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs b/Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs new file mode 100644 index 00000000..678486af --- /dev/null +++ b/Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Emerald.CoreX.Store.Modrinth.JSON; + +namespace Emerald.CoreX.Store.Modrinth; + +public interface IModrinthStore +{ + Task<SearchResult?> SearchAsync(string query, int limit = 15, + SearchSortOptions sortOptions = SearchSortOptions.Relevance, string[]? categories = null); + + Task<StoreItem?> GetItemAsync(string id); + Task<List<ItemVersion>?> GetVersionsAsync(string id); + Task DownloadItemAsync(ItemFile file, string projectType); +} diff --git a/Emerald.CoreX/Store/Modrinth/JSON.cs b/Emerald.CoreX/Store/Modrinth/JSON.cs new file mode 100644 index 00000000..fee9bfea --- /dev/null +++ b/Emerald.CoreX/Store/Modrinth/JSON.cs @@ -0,0 +1,211 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Emerald.CoreX.Store.Modrinth.JSON; + +public class SearchResult +{ + [JsonProperty("hits")] public List<SearchHit> Hits { get; set; } + + [JsonProperty("offset")] public int Offset { get; set; } + + [JsonProperty("limit")] public int Limit { get; set; } + + [JsonProperty("total_hits")] public int TotalHits { get; set; } +} + +public class Category +{ + public string icon { get; set; } + public string name { get; set; } + public string project_type { get; set; } + public string header { get; set; } +} + +public class SearchHit +{ + [JsonProperty("slug")] public string Slug { get; set; } + + [JsonProperty("title")] public string Title { get; set; } + + [JsonProperty("description")] public string Description { get; set; } + + [JsonProperty("categories")] public string[] Categories { get; set; } + + [JsonProperty("client_side")] public string ClientSide { get; set; } + + [JsonProperty("server_side")] public string ServerSide { get; set; } + + [JsonProperty("project_type")] public string ProjectType { get; set; } + + [JsonProperty("downloads")] public int Downloads { get; set; } + + [JsonProperty("icon_url")] public string IconUrl { get; set; } + + [JsonProperty("project_id")] public string ProjectId { get; set; } + + [JsonProperty("author")] public string Author { get; set; } + + [JsonProperty("versions")] public string[] Versions { get; set; } + + [JsonProperty("follows")] public int Follows { get; set; } + + [JsonProperty("date_created")] public DateTime DateCreated { get; set; } + + [JsonProperty("date_modified")] public DateTime DateModified { get; set; } + + [JsonProperty("latest_version")] public string LatestVersion { get; set; } + + [JsonProperty("license")] public string License { get; set; } + + [JsonProperty("gallery")] public string[] Gallery { get; set; } +} + +public class StoreItem +{ + [JsonProperty("id")] public string ID { get; set; } + + [JsonProperty("slug")] public string Slug { get; set; } + + [JsonProperty("project_type")] public string ProjectType { get; set; } + + [JsonProperty("team")] public string Team { get; set; } + + [JsonProperty("title")] public string Title { get; set; } + + [JsonProperty("description")] public string Description { get; set; } + + [JsonProperty("body")] public string Body { get; set; } + + [JsonProperty("body_url")] public string BodyUrl { get; set; } + + [JsonProperty("published")] public DateTime PublishedDate { get; set; } + + [JsonProperty("updated")] public DateTime UpdatedDate { get; set; } + + [JsonProperty("status")] public string Status { get; set; } + + [JsonProperty("moderator_message")] public object? ModeratorMessage { get; set; } + + [JsonProperty("license")] public License License { get; set; } + + [JsonProperty("client_side")] public string ClientSide { get; set; } + + [JsonProperty("server_side")] public string ServerSide { get; set; } + + [JsonProperty("downloads")] public int Downloads { get; set; } + + [JsonProperty("followers")] public int Followers { get; set; } + + [JsonProperty("categories")] public string[] Categories { get; set; } + + [JsonProperty("versions")] public string[] Versions { get; set; } + + [JsonProperty("icon_url")] public string IconUrl { get; set; } + + [JsonProperty("issues_url")] public string IssuesUrl { get; set; } + + [JsonProperty("source_url")] public string SourceUrl { get; set; } + + [JsonProperty("wiki_url")] public object? WikiUrl { get; set; } + + [JsonProperty("discord_url")] public string DiscordUrl { get; set; } + + [JsonProperty("donation_urls")] public DonationUrls[] DonationUrls { get; set; } + + [JsonProperty("gallery")] public object[] Gallery { get; set; } +} + +public class ItemVersion : INotifyPropertyChanged +{ + public bool IsDetailsVisible { get; set; } = false; + public string? FileName => Files.FirstOrDefault(x => x.Primary)?.Filename; + + [JsonProperty("id")] public string ID { get; set; } + + [JsonProperty("project_id")] public string ProjectId { get; set; } + + [JsonProperty("author_id")] public string AuthorId { get; set; } + + [JsonProperty("featured")] public bool Featured { get; set; } + + [JsonProperty("name")] public string Name { get; set; } + + [JsonProperty("version_number")] public string VersionNumber { get; set; } + + [JsonProperty("changelog")] public string Changelog { get; set; } + + [JsonProperty("changelog_url")] public string? ChangelogUrl { get; set; } + + [JsonProperty("date_published")] public DateTime DatePublished { get; set; } + + [JsonProperty("downloads")] public int Downloads { get; set; } + + [JsonProperty("version_type")] public string VersionType { get; set; } + + [JsonProperty("files")] public ItemFile[] Files { get; set; } + + [JsonProperty("dependencies")] public Dependency[] Dependencies { get; set; } + + [JsonProperty("game_versions")] public string[] GameVersions { get; set; } + + [JsonProperty("loaders")] public string[] Loaders { get; set; } + + public event PropertyChangedEventHandler? PropertyChanged; + + public void InvokePropertyChanged(string? propertyName = null) => + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); +} + +public class Dependency +{ + [JsonProperty("version_id")] public string VersionId { get; set; } + + [JsonProperty("project_id")] public string ProjectId { get; set; } + + [JsonProperty("file_name")] public string FileName { get; set; } + + [JsonProperty("dependency_type")] public string DependencyType { get; set; } +} + +public class ItemFile +{ + [JsonProperty("hashes")] public Hashes Hashes { get; set; } + + [JsonProperty("url")] public string Url { get; set; } + + [JsonProperty("filename")] public string Filename { get; set; } + + [JsonProperty("primary")] public bool Primary { get; set; } + + [JsonProperty("size")] public int Size { get; set; } +} + +public class Hashes +{ + [JsonProperty("sha512")] public string Sha512 { get; set; } + + [JsonProperty("sha1")] public string Sha1 { get; set; } +} + +public class License +{ + [JsonProperty("id")] public string ID { get; set; } + + [JsonProperty("name")] public string Name { get; set; } + + [JsonProperty("url")] public string Url { get; set; } +} + +public class DonationUrls +{ + [JsonProperty("id")] public string ID { get; set; } + + [JsonProperty("platform")] public string Platform { get; set; } + + [JsonProperty("url")] public string Url { get; set; } +} diff --git a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs new file mode 100644 index 00000000..9f1b16e3 --- /dev/null +++ b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs @@ -0,0 +1,188 @@ +using CmlLib.Core; +using Newtonsoft.Json; +using RestSharp; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; +using Emerald.CoreX.Store.Modrinth.JSON; + +namespace Emerald.CoreX.Store.Modrinth; + +public abstract class ModrinthStore : IMinecraftStore +{ + protected readonly RestClient _client; + public MinecraftPath MCPath { get; } + protected readonly ILogger _logger; + protected readonly string _projectType; + protected Category[] Categories; + protected ModrinthStore(MinecraftPath path, ILogger logger, string projectType) + { + _client = new RestClient("https://api.modrinth.com/v2/"); + _client.AddDefaultHeader("Accept", "application/json"); + MCPath = path; + _logger = logger; + _projectType = projectType; + } + + + protected async Task LoadCategoriesAsync() + { + var request = new RestRequest("tag/category"); + + try + { + var response = await _client.ExecuteAsync(request); + if (response.IsSuccessful) + { + var all = JsonConvert.DeserializeObject<List<Category>>(response.Content); + + var _categories = all + .Where(i => i.header == "categories" + && i.project_type == _projectType + && !string.IsNullOrWhiteSpace(i.icon) + && !string.IsNullOrWhiteSpace(i.name)) + .ToList(); + Categories = _categories.ToArray(); + _logger.LogInformation($"Loaded {_categories.Count} {_projectType} categories."); + } + else + { + _logger.LogError($"Failed to load {_projectType} categories. Status code: {response.StatusCode}"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, $"Error occurred while loading {_projectType} categories."); + } + } + public virtual async Task<SearchResult?> SearchAsync(string query, int limit = 15, + SearchSortOptions sortOptions = SearchSortOptions.Relevance, string[]? categories = null) + { + _logger.LogInformation($"Searching store for {_projectType}s with query: {query}"); + + try + { + string categoriesString = (categories != null && categories.Any()) + ? $"[\"categories:{string.Join("\"],[\"categories:", categories)}]\"]," + : ""; + + var request = new RestRequest("search") + .AddParameter("index", sortOptions.ToString().ToLowerInvariant()) + .AddParameter("facets", $"[{categoriesString}[\"project_type:{_projectType}\"]]") + .AddParameter("limit", limit); + + if (!string.IsNullOrEmpty(query)) + { + request.AddParameter("query", query); + } + + var response = await _client.ExecuteAsync(request); + if (response.IsSuccessful) + { + var result = JsonConvert.DeserializeObject<SearchResult>(response.Content); + _logger.LogInformation($"Search completed successfully. Found {result.TotalHits} {_projectType}s."); + return result; + } + else + { + _logger.LogError($"API request failed: {response.ErrorMessage}"); + throw new Exception($"API request failed: {response.ErrorMessage}"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, $"Error occurred while searching for {_projectType}s"); + return null; + } + } + + public virtual async Task<StoreItem?> GetItemAsync(string id) + { + _logger.LogInformation($"Fetching {_projectType} with ID: {id}"); + + try + { + var request = new RestRequest($"project/{id}"); + var response = await _client.ExecuteAsync(request); + + if (response.IsSuccessful) + { + var item = JsonConvert.DeserializeObject<StoreItem>(response.Content); + _logger.LogInformation($"Successfully fetched {_projectType} with ID: {id}"); + return item; + } + else + { + _logger.LogError($"API request failed: {response.ErrorMessage}"); + throw new Exception($"API request failed: {response.ErrorMessage}"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, $"Error occurred while fetching {_projectType} with ID: {id}"); + return null; + } + } + + public virtual async Task<List<ItemVersion>?> GetVersionsAsync(string id) + { + _logger.LogInformation($"Fetching versions for {_projectType} with ID: {id}"); + + try + { + var request = new RestRequest($"project/{id}/version"); + var response = await _client.ExecuteAsync(request); + + if (response.IsSuccessful) + { + var versions = JsonConvert.DeserializeObject<List<ItemVersion>>(response.Content); + _logger.LogInformation($"Successfully fetched versions for {_projectType} with ID: {id}"); + return versions; + } + else + { + _logger.LogError($"API request failed: {response.ErrorMessage}"); + throw new Exception($"API request failed: {response.ErrorMessage}"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, $"Error occurred while fetching versions for {_projectType} with ID: {id}"); + return null; + } + } + + public virtual async Task DownloadItemAsync(ItemFile file, string projectType) + { + _logger.LogInformation($"Downloading {projectType} file from URL: {file.Url}"); + + try + { + var request = new RestRequest(file.Url); + var response = await _client.ExecuteAsync(request); + + if (response.IsSuccessful) + { + var filePath = Path.Combine(MCPath.BasePath, projectType, file.Filename); + Directory.CreateDirectory(Path.GetDirectoryName(filePath)); + await File.WriteAllBytesAsync(filePath, response.RawBytes); + + _logger.LogInformation($"Successfully downloaded {projectType} file to: {filePath}"); + } + else + { + _logger.LogError($"File download failed: {response.ErrorMessage}"); + throw new Exception($"File download failed: {response.ErrorMessage}"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, $"Error occurred while downloading {projectType} file from URL: {file.Url}"); + throw; + } + } +} diff --git a/Emerald.CoreX/Store/Modrinth/SearchSortOptions.cs b/Emerald.CoreX/Store/Modrinth/SearchSortOptions.cs new file mode 100644 index 00000000..416e8af9 --- /dev/null +++ b/Emerald.CoreX/Store/Modrinth/SearchSortOptions.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Emerald.CoreX.Store.Modrinth; +public enum SearchSortOptions +{ + Relevance, + Downloads, + Follows, + Updated, + Newest +} diff --git a/Emerald.CoreX/Store/Modrinth/Stores.cs b/Emerald.CoreX/Store/Modrinth/Stores.cs new file mode 100644 index 00000000..d9172302 --- /dev/null +++ b/Emerald.CoreX/Store/Modrinth/Stores.cs @@ -0,0 +1,148 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Emerald.CoreX.Store.Modrinth.JSON; +using Microsoft.Extensions.Logging; +using CMLLib.Core; +namespace Emerald.CoreX.Store.Modrinth; + +public class ModStore : ModrinthStore +{ + public ModStore(MinecraftPath path, ILogger logger) : base(path, logger, "mod") + { + } + + public ModStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) + { + } + + public override async Task<StoreItem?> GetItemAsync(string id) + { + // Implement mod-specific logic if needed + return await base.GetItemAsync(id); + } + + public override async Task<List<ItemVersion>?> GetVersionsAsync(string id) + { + // Implement mod-specific logic if needed + return await base.GetVersionsAsync(id); + } + + public override async Task DownloadItemAsync(ItemFile file, string projectType) + { + // Implement mod-specific download logic + await base.DownloadItemAsync(file, "mods"); + } +} + +public class PluginStore : ModrinthStore +{ + public PluginStore(MinecraftPath path, ILogger logger) : base(path, logger, "plugin") + { + } + + public PluginStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) + { + } + + public override async Task<StoreItem?> GetItemAsync(string id) + { + return await base.GetItemAsync(id); + } + + public override async Task<List<ItemVersion>?> GetVersionsAsync(string id) + { + return await base.GetVersionsAsync(id); + } + + public override async Task DownloadItemAsync(ItemFile file, string projectType) + { + await base.DownloadItemAsync(file, "mods"); + } +} + +public class ResourcePackStore : ModrinthStore +{ + public ResourcePackStore(MinecraftPath path, ILogger logger) : base(path, logger, "resourcepack") + { + } + + public ResourcePackStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) + { + } + + public override async Task<StoreItem?> GetItemAsync(string id) + { + return await base.GetItemAsync(id); + } + + public override async Task<List<ItemVersion>?> GetVersionsAsync(string id) + { + return await base.GetVersionsAsync(id); + } + + public override async Task DownloadItemAsync(ItemFile file, string projectType) + { + await base.DownloadItemAsync(file, "resourcepacks"); + } +} + +public class ShaderStore : ModrinthStore +{ + public ShaderStore(MinecraftPath path, ILogger logger) : base(path, logger, "shader") + { + } + + public ShaderStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) + { + } + + public override async Task<StoreItem?> GetItemAsync(string id) + { + // Implement shader-specific logic if needed + return await base.GetItemAsync(id); + } + + public override async Task<List<ItemVersion>?> GetVersionsAsync(string id) + { + // Implement shader-specific logic if needed + return await base.GetVersionsAsync(id); + } + + public override async Task DownloadItemAsync(ItemFile file, string projectType) + { + // Implement shader-specific download logic + await base.DownloadItemAsync(file, "shaders"); + } +} + +public class ModpackStore : ModrinthStore +{ + public ModpackStore(MinecraftPath path, ILogger logger) : base(path, logger, "modpack") + { + } + + public ModpackStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) + { + } + + public override async Task<StoreItem?> GetItemAsync(string id) + { + // Implement modpack-specific logic if needed + return await base.GetItemAsync(id); + } + + public override async Task<List<ItemVersion>?> GetVersionsAsync(string id) + { + // Implement modpack-specific logic if needed + return await base.GetVersionsAsync(id); + } + + public override async Task DownloadItemAsync(ItemFile file, string projectType) + { + // Implement modpack-specific download logic + await base.DownloadItemAsync(file, "modpacks"); + } +} From 6b9caab1a419722b3caa94a3a20c80523cdd6d3a Mon Sep 17 00:00:00 2001 From: codefactor-io <support@codefactor.io> Date: Thu, 8 Aug 2024 07:13:36 +0000 Subject: [PATCH 28/61] [CodeFactor] Apply fixes --- Emerald.CoreX/Store/Modrinth/ModrinthStore.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs index 9f1b16e3..a533b3f3 100644 --- a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs +++ b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs @@ -66,7 +66,7 @@ protected async Task LoadCategoriesAsync() try { - string categoriesString = (categories != null && categories.Any()) + string categoriesString = (categories != null && categories.Length != 0) ? $"[\"categories:{string.Join("\"],[\"categories:", categories)}]\"]," : ""; From e7d8b845e53e35b0c34268abe68c1d9ab696d3d5 Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Thu, 8 Aug 2024 19:48:48 +0530 Subject: [PATCH 29/61] add suppport for loading different categories to different types in store --- .../Store/Modrinth/IMinecraftStore.cs | 3 +- Emerald.CoreX/Store/Modrinth/ModrinthStore.cs | 306 ++++++++---------- 2 files changed, 137 insertions(+), 172 deletions(-) diff --git a/Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs b/Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs index 678486af..9d61bcea 100644 --- a/Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs +++ b/Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs @@ -7,7 +7,7 @@ namespace Emerald.CoreX.Store.Modrinth; -public interface IModrinthStore +public interface IMinecraftStore { Task<SearchResult?> SearchAsync(string query, int limit = 15, SearchSortOptions sortOptions = SearchSortOptions.Relevance, string[]? categories = null); @@ -15,4 +15,5 @@ public interface IModrinthStore Task<StoreItem?> GetItemAsync(string id); Task<List<ItemVersion>?> GetVersionsAsync(string id); Task DownloadItemAsync(ItemFile file, string projectType); + public Category[] Categories { get; } } diff --git a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs index 9f1b16e3..3e8bc85f 100644 --- a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs +++ b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs @@ -12,177 +12,141 @@ namespace Emerald.CoreX.Store.Modrinth; -public abstract class ModrinthStore : IMinecraftStore +public class ModStore : ModrinthStore { - protected readonly RestClient _client; - public MinecraftPath MCPath { get; } - protected readonly ILogger _logger; - protected readonly string _projectType; - protected Category[] Categories; - protected ModrinthStore(MinecraftPath path, ILogger logger, string projectType) - { - _client = new RestClient("https://api.modrinth.com/v2/"); - _client.AddDefaultHeader("Accept", "application/json"); - MCPath = path; - _logger = logger; - _projectType = projectType; - } - - - protected async Task LoadCategoriesAsync() - { - var request = new RestRequest("tag/category"); - - try - { - var response = await _client.ExecuteAsync(request); - if (response.IsSuccessful) - { - var all = JsonConvert.DeserializeObject<List<Category>>(response.Content); - - var _categories = all - .Where(i => i.header == "categories" - && i.project_type == _projectType - && !string.IsNullOrWhiteSpace(i.icon) - && !string.IsNullOrWhiteSpace(i.name)) - .ToList(); - Categories = _categories.ToArray(); - _logger.LogInformation($"Loaded {_categories.Count} {_projectType} categories."); - } - else - { - _logger.LogError($"Failed to load {_projectType} categories. Status code: {response.StatusCode}"); - } - } - catch (Exception ex) - { - _logger.LogError(ex, $"Error occurred while loading {_projectType} categories."); - } - } - public virtual async Task<SearchResult?> SearchAsync(string query, int limit = 15, - SearchSortOptions sortOptions = SearchSortOptions.Relevance, string[]? categories = null) - { - _logger.LogInformation($"Searching store for {_projectType}s with query: {query}"); - - try - { - string categoriesString = (categories != null && categories.Any()) - ? $"[\"categories:{string.Join("\"],[\"categories:", categories)}]\"]," - : ""; - - var request = new RestRequest("search") - .AddParameter("index", sortOptions.ToString().ToLowerInvariant()) - .AddParameter("facets", $"[{categoriesString}[\"project_type:{_projectType}\"]]") - .AddParameter("limit", limit); - - if (!string.IsNullOrEmpty(query)) - { - request.AddParameter("query", query); - } - - var response = await _client.ExecuteAsync(request); - if (response.IsSuccessful) - { - var result = JsonConvert.DeserializeObject<SearchResult>(response.Content); - _logger.LogInformation($"Search completed successfully. Found {result.TotalHits} {_projectType}s."); - return result; - } - else - { - _logger.LogError($"API request failed: {response.ErrorMessage}"); - throw new Exception($"API request failed: {response.ErrorMessage}"); - } - } - catch (Exception ex) - { - _logger.LogError(ex, $"Error occurred while searching for {_projectType}s"); - return null; - } - } - - public virtual async Task<StoreItem?> GetItemAsync(string id) - { - _logger.LogInformation($"Fetching {_projectType} with ID: {id}"); - - try - { - var request = new RestRequest($"project/{id}"); - var response = await _client.ExecuteAsync(request); - - if (response.IsSuccessful) - { - var item = JsonConvert.DeserializeObject<StoreItem>(response.Content); - _logger.LogInformation($"Successfully fetched {_projectType} with ID: {id}"); - return item; - } - else - { - _logger.LogError($"API request failed: {response.ErrorMessage}"); - throw new Exception($"API request failed: {response.ErrorMessage}"); - } - } - catch (Exception ex) - { - _logger.LogError(ex, $"Error occurred while fetching {_projectType} with ID: {id}"); - return null; - } - } - - public virtual async Task<List<ItemVersion>?> GetVersionsAsync(string id) - { - _logger.LogInformation($"Fetching versions for {_projectType} with ID: {id}"); - - try - { - var request = new RestRequest($"project/{id}/version"); - var response = await _client.ExecuteAsync(request); - - if (response.IsSuccessful) - { - var versions = JsonConvert.DeserializeObject<List<ItemVersion>>(response.Content); - _logger.LogInformation($"Successfully fetched versions for {_projectType} with ID: {id}"); - return versions; - } - else - { - _logger.LogError($"API request failed: {response.ErrorMessage}"); - throw new Exception($"API request failed: {response.ErrorMessage}"); - } - } - catch (Exception ex) - { - _logger.LogError(ex, $"Error occurred while fetching versions for {_projectType} with ID: {id}"); - return null; - } - } - - public virtual async Task DownloadItemAsync(ItemFile file, string projectType) - { - _logger.LogInformation($"Downloading {projectType} file from URL: {file.Url}"); - - try - { - var request = new RestRequest(file.Url); - var response = await _client.ExecuteAsync(request); - - if (response.IsSuccessful) - { - var filePath = Path.Combine(MCPath.BasePath, projectType, file.Filename); - Directory.CreateDirectory(Path.GetDirectoryName(filePath)); - await File.WriteAllBytesAsync(filePath, response.RawBytes); - - _logger.LogInformation($"Successfully downloaded {projectType} file to: {filePath}"); - } - else - { - _logger.LogError($"File download failed: {response.ErrorMessage}"); - throw new Exception($"File download failed: {response.ErrorMessage}"); - } - } - catch (Exception ex) - { - _logger.LogError(ex, $"Error occurred while downloading {projectType} file from URL: {file.Url}"); - throw; - } + public ModStore(MinecraftPath path, ILogger logger) : base(path, logger, "mod") + { + } + + public ModStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) + { + } + + public override async Task<StoreItem?> GetItemAsync(string id) + { + // Implement mod-specific logic if needed + return await base.GetItemAsync(id); + } + + public override async Task<List<ItemVersion>?> GetVersionsAsync(string id) + { + // Implement mod-specific logic if needed + return await base.GetVersionsAsync(id); + } + + public override async Task DownloadItemAsync(ItemFile file, string projectType) + { + // Implement mod-specific download logic + await base.DownloadItemAsync(file, "mods"); + } +} + +public class PluginStore : ModrinthStore +{ + public PluginStore(MinecraftPath path, ILogger logger) : base(path, logger, "plugin") + { + } + + public PluginStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) + { + } + + public override async Task<StoreItem?> GetItemAsync(string id) + { + return await base.GetItemAsync(id); + } + + public override async Task<List<ItemVersion>?> GetVersionsAsync(string id) + { + return await base.GetVersionsAsync(id); + } + + public override async Task DownloadItemAsync(ItemFile file, string projectType) + { + await base.DownloadItemAsync(file, "mods"); + } +} + +public class ResourcePackStore : ModrinthStore +{ + public ResourcePackStore(MinecraftPath path, ILogger logger) : base(path, logger, "resourcepack") + { + } + + public ResourcePackStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) + { + } + + public override async Task<StoreItem?> GetItemAsync(string id) + { + return await base.GetItemAsync(id); + } + + public override async Task<List<ItemVersion>?> GetVersionsAsync(string id) + { + return await base.GetVersionsAsync(id); + } + + public override async Task DownloadItemAsync(ItemFile file, string projectType) + { + await base.DownloadItemAsync(file, "resourcepacks"); + } +} + +public class ShaderStore : ModrinthStore +{ + public ShaderStore(MinecraftPath path, ILogger logger) : base(path, logger, "shader") + { + } + + public ShaderStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) + { + } + + public override async Task<StoreItem?> GetItemAsync(string id) + { + // Implement shader-specific logic if needed + return await base.GetItemAsync(id); + } + + public override async Task<List<ItemVersion>?> GetVersionsAsync(string id) + { + // Implement shader-specific logic if needed + return await base.GetVersionsAsync(id); + } + + public override async Task DownloadItemAsync(ItemFile file, string projectType) + { + // Implement shader-specific download logic + await base.DownloadItemAsync(file, "shaders"); + } +} + +public class ModpackStore : ModrinthStore +{ + public ModpackStore(MinecraftPath path, ILogger logger) : base(path, logger, "modpack") + { + } + + public ModpackStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) + { + } + + public override async Task<StoreItem?> GetItemAsync(string id) + { + // Implement modpack-specific logic if needed + return await base.GetItemAsync(id); + } + + public override async Task<List<ItemVersion>?> GetVersionsAsync(string id) + { + // Implement modpack-specific logic if needed + return await base.GetVersionsAsync(id); + } + + public override async Task DownloadItemAsync(ItemFile file, string projectType) + { + // Implement modpack-specific download logic + await base.DownloadItemAsync(file, "modpacks"); } } From 5e1476f153569a9897d615f44665d171657e1d8f Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Thu, 8 Aug 2024 20:06:11 +0530 Subject: [PATCH 30/61] undo 1 change --- Emerald.CoreX/Store/Modrinth/ModrinthStore.cs | 308 ++++++++++-------- 1 file changed, 174 insertions(+), 134 deletions(-) diff --git a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs index 3e8bc85f..d978c353 100644 --- a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs +++ b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs @@ -12,141 +12,181 @@ namespace Emerald.CoreX.Store.Modrinth; -public class ModStore : ModrinthStore +public abstract class ModrinthStore : IMinecraftStore { - public ModStore(MinecraftPath path, ILogger logger) : base(path, logger, "mod") - { - } - - public ModStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) - { - } - - public override async Task<StoreItem?> GetItemAsync(string id) - { - // Implement mod-specific logic if needed - return await base.GetItemAsync(id); - } - - public override async Task<List<ItemVersion>?> GetVersionsAsync(string id) - { - // Implement mod-specific logic if needed - return await base.GetVersionsAsync(id); - } - - public override async Task DownloadItemAsync(ItemFile file, string projectType) - { - // Implement mod-specific download logic - await base.DownloadItemAsync(file, "mods"); - } -} - -public class PluginStore : ModrinthStore -{ - public PluginStore(MinecraftPath path, ILogger logger) : base(path, logger, "plugin") - { - } - - public PluginStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) - { - } - - public override async Task<StoreItem?> GetItemAsync(string id) - { - return await base.GetItemAsync(id); - } - - public override async Task<List<ItemVersion>?> GetVersionsAsync(string id) - { - return await base.GetVersionsAsync(id); - } - - public override async Task DownloadItemAsync(ItemFile file, string projectType) - { - await base.DownloadItemAsync(file, "mods"); - } -} - -public class ResourcePackStore : ModrinthStore -{ - public ResourcePackStore(MinecraftPath path, ILogger logger) : base(path, logger, "resourcepack") - { - } - - public ResourcePackStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) - { - } - - public override async Task<StoreItem?> GetItemAsync(string id) - { - return await base.GetItemAsync(id); - } - - public override async Task<List<ItemVersion>?> GetVersionsAsync(string id) - { - return await base.GetVersionsAsync(id); - } - - public override async Task DownloadItemAsync(ItemFile file, string projectType) - { - await base.DownloadItemAsync(file, "resourcepacks"); - } -} - -public class ShaderStore : ModrinthStore -{ - public ShaderStore(MinecraftPath path, ILogger logger) : base(path, logger, "shader") - { - } - - public ShaderStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) - { - } - - public override async Task<StoreItem?> GetItemAsync(string id) - { - // Implement shader-specific logic if needed - return await base.GetItemAsync(id); - } - - public override async Task<List<ItemVersion>?> GetVersionsAsync(string id) - { - // Implement shader-specific logic if needed - return await base.GetVersionsAsync(id); - } - - public override async Task DownloadItemAsync(ItemFile file, string projectType) - { - // Implement shader-specific download logic - await base.DownloadItemAsync(file, "shaders"); - } -} - -public class ModpackStore : ModrinthStore -{ - public ModpackStore(MinecraftPath path, ILogger logger) : base(path, logger, "modpack") - { - } - - public ModpackStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) - { - } - - public override async Task<StoreItem?> GetItemAsync(string id) - { - // Implement modpack-specific logic if needed - return await base.GetItemAsync(id); + protected readonly RestClient _client; + public MinecraftPath MCPath { get; } + protected readonly ILogger _logger; + protected readonly string _projectType; + public Category[] Categories { get; private set; } = []; + protected ModrinthStore(MinecraftPath path, ILogger logger, string projectType) + { + _client = new RestClient("https://api.modrinth.com/v2/"); + _client.AddDefaultHeader("Accept", "application/json"); + MCPath = path; + _logger = logger; + _projectType = projectType; + } + + public async Task LoadCategoriesAsync() + { + var request = new RestRequest("tag/category"); + + try + { + var response = await _client.ExecuteAsync(request); + if (response.IsSuccessful) + { + var all = JsonConvert.DeserializeObject<List<Category>>(response.Content); + + var _categories = all + .Where(i => i.header == "categories" + && i.project_type == _projectType + && !string.IsNullOrWhiteSpace(i.icon) + && !string.IsNullOrWhiteSpace(i.name)) + .ToList(); + Categories = _categories.ToArray(); + _logger.LogInformation($"Loaded {_categories.Count} {_projectType} categories."); + } + else + { + _logger.LogError($"Failed to load {_projectType} categories. Status code: {response.StatusCode}"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, $"Error occurred while loading {_projectType} categories."); + } + } + public virtual async Task<SearchResult?> SearchAsync(string query, int limit = 15, + SearchSortOptions sortOptions = SearchSortOptions.Relevance, string[]? categories = null) + { + _logger.LogInformation($"Searching store for {_projectType}s with query: {query}"); + + try + { + // Prepare the facets parameter correctly + string facets = "[[\"project_type:" + _projectType + "\"]"; + if (categories != null && categories.Any()) + { + var categoryFacets = categories.Select(cat => $"\"categories:{cat}\""); + facets += ",[" + string.Join(",", categoryFacets) + "]"; + } + facets += "]"; + + var request = new RestRequest("search") + .AddParameter("index", sortOptions.ToString().ToLowerInvariant()) + .AddParameter("facets", facets) + .AddParameter("limit", limit); + + if (!string.IsNullOrEmpty(query)) + { + request.AddParameter("query", query); + } + + var response = await _client.ExecuteAsync(request); + if (response.IsSuccessful) + { + var result = JsonConvert.DeserializeObject<SearchResult>(response.Content); + _logger.LogInformation($"Search completed successfully. Found {result.TotalHits} {_projectType}s."); + return result; + } + else + { + _logger.LogError($"API request failed: {response.ErrorMessage}"); + throw new Exception($"API request failed: {response.ErrorMessage}"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, $"Error occurred while searching for {_projectType}s"); + return null; + } + } + + public virtual async Task<StoreItem?> GetItemAsync(string id) + { + _logger.LogInformation($"Fetching {_projectType} with ID: {id}"); + + try + { + var request = new RestRequest($"project/{id}"); + var response = await _client.ExecuteAsync(request); + + if (response.IsSuccessful) + { + var item = JsonConvert.DeserializeObject<StoreItem>(response.Content); + _logger.LogInformation($"Successfully fetched {_projectType} with ID: {id}"); + return item; + } + else + { + _logger.LogError($"API request failed: {response.ErrorMessage}"); + throw new Exception($"API request failed: {response.ErrorMessage}"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, $"Error occurred while fetching {_projectType} with ID: {id}"); + return null; + } + } + + public virtual async Task<List<ItemVersion>?> GetVersionsAsync(string id) + { + _logger.LogInformation($"Fetching versions for {_projectType} with ID: {id}"); + + try + { + var request = new RestRequest($"project/{id}/version"); + var response = await _client.ExecuteAsync(request); + + if (response.IsSuccessful) + { + var versions = JsonConvert.DeserializeObject<List<ItemVersion>>(response.Content); + _logger.LogInformation($"Successfully fetched versions for {_projectType} with ID: {id}"); + return versions; + } + else + { + _logger.LogError($"API request failed: {response.ErrorMessage}"); + throw new Exception($"API request failed: {response.ErrorMessage}"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, $"Error occurred while fetching versions for {_projectType} with ID: {id}"); + return null; + } + } + + public virtual async Task DownloadItemAsync(ItemFile file, string projectType) + { + _logger.LogInformation($"Downloading {projectType} file from URL: {file.Url}"); + + try + { + var request = new RestRequest(file.Url); + var response = await _client.ExecuteAsync(request); + if (response.IsSuccessful) + { + var filePath = Path.Combine(MCPath.BasePath, projectType, file.Filename); + Directory.CreateDirectory(Path.GetDirectoryName(filePath)); + await File.WriteAllBytesAsync(filePath, response.RawBytes); + + _logger.LogInformation($"Successfully downloaded {projectType} file to: {filePath}"); + } + else + { + _logger.LogError($"File download failed: {response.ErrorMessage}"); + throw new Exception($"File download failed: {response.ErrorMessage}"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, $"Error occurred while downloading {projectType} file from URL: {file.Url}"); + throw; + } } - public override async Task<List<ItemVersion>?> GetVersionsAsync(string id) - { - // Implement modpack-specific logic if needed - return await base.GetVersionsAsync(id); - } - - public override async Task DownloadItemAsync(ItemFile file, string projectType) - { - // Implement modpack-specific download logic - await base.DownloadItemAsync(file, "modpacks"); - } } From 05b9a094741892f60eba0d13fa3473d252dd0d0b Mon Sep 17 00:00:00 2001 From: Lamparter <notlamparter@outlook.com> Date: Thu, 22 Aug 2024 14:51:12 +0200 Subject: [PATCH 31/61] =?UTF-8?q?=F0=9F=91=B7=20Implement=20central=20pack?= =?UTF-8?q?age=20management=20(#42)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ⚰ Remove Nuget package references from Emerald.App.csproj * ⚰ Remove Nuget package references from Emerald.Core.csproj * ⚰ Remove Nuget package references from Emerald.CoreX.csproj * 📌 Add dependencies to Directory.Packages.props * 👷 Implement central package management in packaging project * 📌 Disable central package management for Emerald.Core * 💡 Remove dependency placeholder for Emerald.Core in central package management --- Directory.Packages.props | 17 ++++++++++++++++ .../Emerald.App.Package/Package.WinUI.wapproj | 4 ++-- Emerald.App/Emerald.App/Emerald.App.csproj | 20 +++++++++---------- Emerald.Core/Emerald.Core.csproj | 3 ++- Emerald.CoreX/Emerald.CoreX.csproj | 14 ++++++------- 5 files changed, 38 insertions(+), 20 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 0cea764d..9c44b086 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,5 +5,22 @@ See https://aka.platform.uno/using-uno-sdk for more information. --> <ItemGroup> + <!--Emerald.App--> + <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" /> + <PackageVersion Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" /> + <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" /> + <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" /> + <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" /> + <PackageVersion Include="Octokit" Version="10.0.0" /> + <PackageVersion Include="PInvoke.User32" Version="0.7.124" /> + <PackageVersion Include="ProjBobcat" Version="1.16.0" /> + <PackageVersion Include="WinUIEx" Version="2.3.4" /> + <PackageVersion Include="XboxAuthNet.Game.Msal" Version="0.0.5" /> + <!--Emerald.CoreX--> + <PackageVersion Include="CmlLib.Core" Version="4.0.0" /> + <PackageVersion Include="CmlLib.Core.Auth.Microsoft" Version="3.1.0" /> + <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.6.24327.7" /> + <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" /> + <PackageVersion Include="RestSharp" Version="111.4.1" /> </ItemGroup> </Project> diff --git a/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj b/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj index c76b14af..d886be42 100644 --- a/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj +++ b/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj @@ -158,10 +158,10 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000"> + <PackageReference Include="Microsoft.WindowsAppSDK"> <IncludeAssets>build</IncludeAssets> </PackageReference> - <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview"> + <PackageReference Include="Microsoft.Windows.SDK.BuildTools"> <IncludeAssets>build</IncludeAssets> </PackageReference> </ItemGroup> diff --git a/Emerald.App/Emerald.App/Emerald.App.csproj b/Emerald.App/Emerald.App/Emerald.App.csproj index c7306220..0532650a 100644 --- a/Emerald.App/Emerald.App/Emerald.App.csproj +++ b/Emerald.App/Emerald.App/Emerald.App.csproj @@ -38,16 +38,16 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" /> - <PackageReference Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" /> - <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" /> - <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" /> - <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" /> - <PackageReference Include="Octokit" Version="10.0.0" /> - <PackageReference Include="PInvoke.User32" Version="0.7.124" /> - <PackageReference Include="ProjBobcat" Version="1.16.0" /> - <PackageReference Include="WinUIEx" Version="2.3.4" /> - <PackageReference Include="XboxAuthNet.Game.Msal" Version="0.0.5" /> + <PackageReference Include="CommunityToolkit.Mvvm" /> + <PackageReference Include="CommunityToolkit.WinUI.UI.Animations" /> + <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" /> + <PackageReference Include="Microsoft.WindowsAppSDK" /> + <PackageReference Include="Microsoft.Windows.SDK.BuildTools" /> + <PackageReference Include="Octokit" /> + <PackageReference Include="PInvoke.User32" /> + <PackageReference Include="ProjBobcat" /> + <PackageReference Include="WinUIEx" /> + <PackageReference Include="XboxAuthNet.Game.Msal" /> <Manifest Include="$(ApplicationManifest)" /> </ItemGroup> diff --git a/Emerald.Core/Emerald.Core.csproj b/Emerald.Core/Emerald.Core.csproj index d143325d..710a97c8 100644 --- a/Emerald.Core/Emerald.Core.csproj +++ b/Emerald.Core/Emerald.Core.csproj @@ -4,10 +4,11 @@ <TargetFramework>net8.0</TargetFramework> <ImplicitUsings>enable</ImplicitUsings> <Nullable>enable</Nullable> + <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally> </PropertyGroup> <ItemGroup> - <PackageReference Include="CmlLib.Core" Version="3.3.10" /> + <PackageReference Include="CmlLib.Core" Version="3.3.10" /> <PackageReference Include="CmlLib.Core.Auth.Microsoft" Version="3.0.1" /> <PackageReference Include="ProjBobcat" Version="1.16.0" /> </ItemGroup> diff --git a/Emerald.CoreX/Emerald.CoreX.csproj b/Emerald.CoreX/Emerald.CoreX.csproj index d875fd8b..8f192bc8 100644 --- a/Emerald.CoreX/Emerald.CoreX.csproj +++ b/Emerald.CoreX/Emerald.CoreX.csproj @@ -7,12 +7,12 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="CmlLib.Core" Version="4.0.0" /> - <PackageReference Include="CmlLib.Core.Auth.Microsoft" Version="3.1.0" /> - <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" /> - <PackageReference Include="ProjBobcat" Version="1.16.0" /> - <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.6.24327.7" /> - <PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> - <PackageReference Include="RestSharp" Version="111.4.1" /> + <PackageReference Include="CmlLib.Core" /> + <PackageReference Include="CmlLib.Core.Auth.Microsoft" /> + <PackageReference Include="CommunityToolkit.Mvvm" /> + <PackageReference Include="ProjBobcat" /> + <PackageReference Include="Microsoft.Extensions.Logging" /> + <PackageReference Include="Newtonsoft.Json" /> + <PackageReference Include="RestSharp" /> </ItemGroup> </Project> \ No newline at end of file From da23505ca2e02c5aca378c1e5c1544ad021ce2c0 Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Thu, 22 Aug 2024 18:26:36 +0530 Subject: [PATCH 32/61] declare verison in InstallerPage --- Emerald.App/Emerald.App/Views/Store/InstallerPage.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Emerald.App/Emerald.App/Views/Store/InstallerPage.xaml.cs b/Emerald.App/Emerald.App/Views/Store/InstallerPage.xaml.cs index a72cf7a9..1f580601 100644 --- a/Emerald.App/Emerald.App/Views/Store/InstallerPage.xaml.cs +++ b/Emerald.App/Emerald.App/Views/Store/InstallerPage.xaml.cs @@ -9,7 +9,7 @@ namespace Emerald.WinUI.Views.Store public sealed partial class InstallerPage : Page { public StoreItem Item { get; set; } - private ObservableCollection<Version> Versions = new(); + private ObservableCollection<Core.Store.Results.Version> Versions = new(); public InstallerPage() { InitializeComponent(); From e38d23a715f0676e6d37403acaa28923860b4dd8 Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Thu, 22 Aug 2024 18:30:36 +0530 Subject: [PATCH 33/61] remove the need of `GithubClientID` --- .gitignore | 4 +--- Emerald.App/Emerald.App/Emerald.App.csproj | 9 +-------- Emerald.App/Emerald.App/Helpers/Updater/Updater.cs | 8 +++----- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 83a8eded..d65e71a2 100644 --- a/.gitignore +++ b/.gitignore @@ -402,9 +402,7 @@ solution-config.props # Publish Profiles !**/Properties/PublishProfiles/*.pubxml -# Azure Active Directory and GitHub OAUTH tokens +# Azure Active Directory tokens /Emerald.App/Emerald.App/MsalClientID.txt /Emerald.Core/MsalClientID.txt -/Emerald.App/Emerald.App/GithubClientID.txt -Emerald.App/GithubClientID.txt Emerald.App/MsalClientID.txt diff --git a/Emerald.App/Emerald.App/Emerald.App.csproj b/Emerald.App/Emerald.App/Emerald.App.csproj index 0532650a..9bb28fb5 100644 --- a/Emerald.App/Emerald.App/Emerald.App.csproj +++ b/Emerald.App/Emerald.App/Emerald.App.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <OutputType>WinExe</OutputType> @@ -15,19 +15,12 @@ </PropertyGroup> <ItemGroup> - <None Remove="GithubClientID.txt" /> <None Remove="Helpers\rlbl1cxv.0sq~" /> <None Remove="MsalClientID.txt" /> <None Remove="Restart.bat" /> <None Remove="Views\Store\InstallerPage.xaml" /> </ItemGroup> - <ItemGroup> - <Content Include="GithubClientID.txt"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </Content> - </ItemGroup> - <ItemGroup> <Content Include="MsalClientID.txt"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> diff --git a/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs b/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs index 246642bb..b11ab1fe 100644 --- a/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs +++ b/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs @@ -1,4 +1,4 @@ -using CmlLib.Core; +using CmlLib.Core; using CommunityToolkit.WinUI.Helpers; using Emerald.Core; using Emerald.Core.Tasks; @@ -39,9 +39,7 @@ public Updater() bool IsInitialized = false; public async System.Threading.Tasks.Task Initialize() { - var cId = await FileIO.ReadTextAsync(await StorageFile.GetFileFromPathAsync($"{Windows.ApplicationModel.Package.Current.InstalledPath}\\GithubClientID.txt")); - - Client = new GitHubClient(new Octokit.ProductHeaderValue(cId)); + Client = new GitHubClient(new Octokit.ProductHeaderValue("Reverside.Emerald")); IsInitialized = true; } private bool isRunning = false; @@ -164,4 +162,4 @@ private async void Install(string path) Process.Start(startInfo); } } -} \ No newline at end of file +} From ae1f893b68b02e16e6a3659d0bb7b3ef1ef697ee Mon Sep 17 00:00:00 2001 From: NoobNotFound <8273016+NoobNotFound@users.noreply.github.com> Date: Thu, 22 Aug 2024 18:46:32 +0530 Subject: [PATCH 34/61] fix some typos in mod downloader, update some dependencies --- Directory.Packages.props | 6 +++--- Emerald.CoreX/Store/Modrinth/JSON.cs | 1 + Emerald.CoreX/Store/Modrinth/Stores.cs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9c44b086..33ac9a87 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -17,10 +17,10 @@ <PackageVersion Include="WinUIEx" Version="2.3.4" /> <PackageVersion Include="XboxAuthNet.Game.Msal" Version="0.0.5" /> <!--Emerald.CoreX--> - <PackageVersion Include="CmlLib.Core" Version="4.0.0" /> - <PackageVersion Include="CmlLib.Core.Auth.Microsoft" Version="3.1.0" /> + <PackageVersion Include="CmlLib.Core" Version="4.0.2" /> + <PackageVersion Include="CmlLib.Core.Auth.Microsoft" Version="3.2.0" /> <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.6.24327.7" /> <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" /> <PackageVersion Include="RestSharp" Version="111.4.1" /> </ItemGroup> -</Project> +</Project> \ No newline at end of file diff --git a/Emerald.CoreX/Store/Modrinth/JSON.cs b/Emerald.CoreX/Store/Modrinth/JSON.cs index fee9bfea..53753575 100644 --- a/Emerald.CoreX/Store/Modrinth/JSON.cs +++ b/Emerald.CoreX/Store/Modrinth/JSON.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using Newtonsoft.Json; namespace Emerald.CoreX.Store.Modrinth.JSON; diff --git a/Emerald.CoreX/Store/Modrinth/Stores.cs b/Emerald.CoreX/Store/Modrinth/Stores.cs index d9172302..ae3c7605 100644 --- a/Emerald.CoreX/Store/Modrinth/Stores.cs +++ b/Emerald.CoreX/Store/Modrinth/Stores.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Emerald.CoreX.Store.Modrinth.JSON; using Microsoft.Extensions.Logging; -using CMLLib.Core; +using CmlLib.Core; namespace Emerald.CoreX.Store.Modrinth; public class ModStore : ModrinthStore From 2e9e7a486704d4c21c6819252eeed762519afffd Mon Sep 17 00:00:00 2001 From: codefactor-io <support@codefactor.io> Date: Thu, 22 Aug 2024 13:21:02 +0000 Subject: [PATCH 35/61] [CodeFactor] Apply fixes --- Emerald.CoreX/Store/Modrinth/ModrinthStore.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs index d978c353..93320a78 100644 --- a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs +++ b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs @@ -67,7 +67,7 @@ public async Task LoadCategoriesAsync() { // Prepare the facets parameter correctly string facets = "[[\"project_type:" + _projectType + "\"]"; - if (categories != null && categories.Any()) + if (categories != null && categories.Length != 0) { var categoryFacets = categories.Select(cat => $"\"categories:{cat}\""); facets += ",[" + string.Join(",", categoryFacets) + "]"; @@ -188,5 +188,4 @@ public virtual async Task DownloadItemAsync(ItemFile file, string projectType) throw; } } - } From 6f9843c002fe7a38d9be1b4e3e5792f6022cc3ae Mon Sep 17 00:00:00 2001 From: Lamparter <notlamparter@outlook.com> Date: Sat, 24 Aug 2024 10:27:40 +0200 Subject: [PATCH 36/61] =?UTF-8?q?=F0=9F=91=94=20Fix=20header=20identity=20?= =?UTF-8?q?typo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lamparter <notlamparter@outlook.com> --- Emerald.App/Emerald.App/Helpers/Updater/Updater.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs b/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs index b11ab1fe..aa8b6086 100644 --- a/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs +++ b/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs @@ -39,7 +39,7 @@ public Updater() bool IsInitialized = false; public async System.Threading.Tasks.Task Initialize() { - Client = new GitHubClient(new Octokit.ProductHeaderValue("Reverside.Emerald")); + Client = new GitHubClient(new Octokit.ProductHeaderValue("Riverside.Emerald")); IsInitialized = true; } private bool isRunning = false; From 8dc48d7b5c1b79c1f4f68541a7b6f5e6d8a8c0bc Mon Sep 17 00:00:00 2001 From: Lamparter <notlamparter@outlook.com> Date: Sun, 25 Aug 2024 09:46:26 +0100 Subject: [PATCH 37/61] =?UTF-8?q?=F0=9F=93=84=20Implement=20MIT=20licence?= =?UTF-8?q?=20(#44)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE.md | 53 +++++++++-------------------------------------------- 1 file changed, 9 insertions(+), 44 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index f28a54a9..b5afa333 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,56 +1,21 @@ -**Nightshade Vexillum License** +MIT License -``` -Emoji are used within this document to outwardly express conventions of easy-to-read documents, and/or help others understand the text at their convenience, if some words may be unclear to them. -The Emoji contained within these documents may not wholly convey the associated meaning, and the First Party does not warrant the misunderstanding of such. -``` +Copyright (c) 2021-2024 Riverside Valley Corporation -## 📖 Definitions - -#### **SOFTWARE** - -The Software is the source-code, executable files, documentation and all associated documents, usually found within this repository. - -#### **FIRST PARTY** - -The First Party are the Copyright Holders of the Software, as defined in **1️⃣ Section I: Parties**. - -#### **THIRD PARTY** - -The Third Party is any party that is **not** the First Party - see the **📖 Oxford English Dictionary** for details. - -#### **Eligible Party** - -An Eligible Party is a party that has been accepted by the First Party. By default manner, the First Party automatically accepts any party that wishes to use the software with no medium of communication other than this license required. The First Party may restrict this license for a Third Party, under any period of time, per their discretion. - - ---- - -### 1️⃣ Section I: Parties - -Copyright (c) 2021-2024 Riverside Valley (the "First Party") - -Licensed to any Eligible Party. - - -### 2️⃣ Section II: Licensing - - - -Permission is hereby granted, free of charge, to any Eligible Party obtaining a substantial portion -of this Software, to deal in the Software without restriction, including without limitation the rights +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -THE FIRST PARTY ASSERTS THE MORAL RIGHT TO BE IDENTIFIED AS THE DEVELOPER OR PRODUCER OF THIS SOFTWARE. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE.** - -**IF A THIRD PARTY CONTRADICTS THIS LICENSE, WITHOUT PERMISSION BY MEDIUM OF OFFICIAL COMMUNICATION, THE FIRST PARTY RESERVES THE RIGHT, IN THE NAME OF THE LAW TO CLAIM OR SEIZE THE CONTRADICTING SOFTWARE RIGHTFULLY AND SHOULD NOT BE HINDERED TO DO SO, PER THE FIRST PARTY'S DISCRETION.** +SOFTWARE. From 6fec37591dc2ee2321c35fe03579f1853b08a972 Mon Sep 17 00:00:00 2001 From: Lamparter <notlamparter@outlook.com> Date: Sun, 25 Aug 2024 09:53:54 +0100 Subject: [PATCH 38/61] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20Remov?= =?UTF-8?q?e=20contributor=20section=20from=20README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lamparter <notlamparter@outlook.com> --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index e3e19bd1..5f12a41c 100644 --- a/README.md +++ b/README.md @@ -64,12 +64,6 @@ There are multiple ways to participate in the community: └──Emerald.Core // Emerald core code (such as code related to launching and modifying Minecraft ``` -### 🗃️ Contributors - -<a href="https://github.com/RiversideValley/Emerald/graphs/contributors"> - <img src="https://contrib.rocks/image?repo=RiversideValley/Emerald" /> -</a> - ## 🔨 Building the Code ### 1️⃣ Prerequisites From bbbba853cc956ba6918200834ef38a48e2cf2c91 Mon Sep 17 00:00:00 2001 From: Lamparter <notlamparter@outlook.com> Date: Sun, 25 Aug 2024 10:23:29 +0100 Subject: [PATCH 39/61] =?UTF-8?q?=E2=9E=95=20Upgrade=20from=20Newtonsoft.J?= =?UTF-8?q?son=20to=20System.Text.Json=20(#45)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Directory.Packages.props | 1 + .../Emerald.App.Package/Package.WinUI.wapproj | 1 + Emerald.App/Emerald.App/Emerald.App.csproj | 1 + .../Emerald.App/Helpers/Settings/JSON.cs | 9 +- .../Helpers/Settings/SettingsSystem.cs | 20 +-- .../Emerald.App/Helpers/Updater/Updater.cs | 2 +- Emerald.Core/Emerald.Core.csproj | 1 + Emerald.Core/News/NewsHelper.cs | 4 +- Emerald.Core/Optifine.cs | 4 +- Emerald.Core/Store/Labrinth.cs | 8 +- Emerald.CoreX/Emerald.CoreX.csproj | 1 + Emerald.CoreX/Store/Modrinth/JSON.cs | 163 +++++++++--------- Emerald.CoreX/Store/Modrinth/ModrinthStore.cs | 10 +- Emerald/Emerald.csproj | 3 + 14 files changed, 119 insertions(+), 109 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 33ac9a87..f986da2a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -14,6 +14,7 @@ <PackageVersion Include="Octokit" Version="10.0.0" /> <PackageVersion Include="PInvoke.User32" Version="0.7.124" /> <PackageVersion Include="ProjBobcat" Version="1.16.0" /> + <PackageVersion Include="System.Text.Json" Version="8.0.4" /> <PackageVersion Include="WinUIEx" Version="2.3.4" /> <PackageVersion Include="XboxAuthNet.Game.Msal" Version="0.0.5" /> <!--Emerald.CoreX--> diff --git a/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj b/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj index d886be42..9920f1a8 100644 --- a/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj +++ b/Emerald.App/Emerald.App.Package/Package.WinUI.wapproj @@ -164,6 +164,7 @@ <PackageReference Include="Microsoft.Windows.SDK.BuildTools"> <IncludeAssets>build</IncludeAssets> </PackageReference> + <PackageReference Include="System.Text.Json" /> </ItemGroup> <ItemGroup> <Folder Include="Properties\" /> diff --git a/Emerald.App/Emerald.App/Emerald.App.csproj b/Emerald.App/Emerald.App/Emerald.App.csproj index 9bb28fb5..30fc8280 100644 --- a/Emerald.App/Emerald.App/Emerald.App.csproj +++ b/Emerald.App/Emerald.App/Emerald.App.csproj @@ -39,6 +39,7 @@ <PackageReference Include="Octokit" /> <PackageReference Include="PInvoke.User32" /> <PackageReference Include="ProjBobcat" /> + <PackageReference Include="System.Text.Json" /> <PackageReference Include="WinUIEx" /> <PackageReference Include="XboxAuthNet.Game.Msal" /> <Manifest Include="$(ApplicationManifest)" /> diff --git a/Emerald.App/Emerald.App/Helpers/Settings/JSON.cs b/Emerald.App/Emerald.App/Helpers/Settings/JSON.cs index 19f0dc87..8122d468 100644 --- a/Emerald.App/Emerald.App/Helpers/Settings/JSON.cs +++ b/Emerald.App/Emerald.App/Helpers/Settings/JSON.cs @@ -1,10 +1,11 @@ -using CmlLib.Core; +using CmlLib.Core; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.WinUI.Helpers; using Emerald.Core.Store.Enums; using Microsoft.UI; using Microsoft.UI.Xaml; -using Newtonsoft.Json; +using System.Text.Json; +using System.Text.Json.Serialization; using System; using System.Collections.Generic; using Windows.UI; @@ -13,7 +14,7 @@ namespace Emerald.WinUI.Helpers.Settings.JSON public class JSON : Models.Model { public string Serialize() - => JsonConvert.SerializeObject(this, Formatting.Indented); + => JsonSerializer.Serialize(this, new JsonSerializerOptions { WriteIndented = true }); } public class SettingsBackup : JSON @@ -21,7 +22,7 @@ public class SettingsBackup : JSON public string Backup { get; set; } public string Name { get; set; } public DateTime Time { get; set; } - //ik there is Time.ToString() lol + // ik there is Time.ToString() lol public string DateString => $"{Time.ToLongDateString()} {Time.ToShortTimeString()}"; } diff --git a/Emerald.App/Emerald.App/Helpers/Settings/SettingsSystem.cs b/Emerald.App/Emerald.App/Helpers/Settings/SettingsSystem.cs index e083f7d2..4e62fd6e 100644 --- a/Emerald.App/Emerald.App/Helpers/Settings/SettingsSystem.cs +++ b/Emerald.App/Emerald.App/Helpers/Settings/SettingsSystem.cs @@ -1,5 +1,5 @@ using Emerald.WinUI.Helpers.Settings.JSON; -using Newtonsoft.Json; +using System.Text.Json; using System; using System.Collections.Generic; using System.Linq; @@ -21,11 +21,11 @@ public static T GetSerializedFromSettings<T>(string key, T def) { json = ApplicationData.Current.RoamingSettings.Values[key] as string; - return JsonConvert.DeserializeObject<T>(json); + return JsonSerializer.Deserialize<T>(json); } catch { - json = JsonConvert.SerializeObject(def); + json = JsonSerializer.Serialize(def); ApplicationData.Current.RoamingSettings.Values[key] = json; return def; } @@ -39,14 +39,14 @@ public static void LoadData() { APINoMatch?.Invoke(null, ApplicationData.Current.RoamingSettings.Values["Settings"] as string); ApplicationData.Current.RoamingSettings.Values["Settings"] = JSON.Settings.CreateNew().Serialize(); - Settings = JsonConvert.DeserializeObject<JSON.Settings>(ApplicationData.Current.RoamingSettings.Values["Settings"] as string); + Settings = JsonSerializer.Deserialize<JSON.Settings>(ApplicationData.Current.RoamingSettings.Values["Settings"] as string); } } public static async Task CreateBackup(string system) { string json = await FileIO.ReadTextAsync(await ApplicationData.Current.LocalFolder.CreateFileAsync("backups.json", CreationCollisionOption.OpenIfExists)); - var l = json.IsNullEmptyOrWhiteSpace() ? new Backups() : JsonConvert.DeserializeObject<Backups>(json); + var l = json.IsNullEmptyOrWhiteSpace() ? new Backups() : JsonSerializer.Deserialize<Backups>(json); var bl = l.AllBackups == null ? new List<SettingsBackup>() : l.AllBackups.ToList(); bl.Add(new SettingsBackup() { Time = DateTime.Now, Backup = system }); @@ -59,7 +59,7 @@ public static async Task CreateBackup(string system) public static async Task DeleteBackup(int Index) { string json = await FileIO.ReadTextAsync(await ApplicationData.Current.LocalFolder.CreateFileAsync("backups.json", CreationCollisionOption.OpenIfExists)); - var l = json.IsNullEmptyOrWhiteSpace() ? new Backups() : JsonConvert.DeserializeObject<Backups>(json); + var l = json.IsNullEmptyOrWhiteSpace() ? new Backups() : JsonSerializer.Deserialize<Backups>(json); var bl = l.AllBackups == null ? new List<SettingsBackup>() : l.AllBackups.ToList(); bl.RemoveAt(Index); @@ -72,7 +72,7 @@ public static async Task DeleteBackup(int Index) public static async Task DeleteBackup(DateTime time) { string json = await FileIO.ReadTextAsync(await ApplicationData.Current.LocalFolder.CreateFileAsync("backups.json", CreationCollisionOption.OpenIfExists)); - var l = json.IsNullEmptyOrWhiteSpace() ? new Backups() : JsonConvert.DeserializeObject<Backups>(json); + var l = json.IsNullEmptyOrWhiteSpace() ? new Backups() : JsonSerializer.Deserialize<Backups>(json); var bl = l.AllBackups == null ? new List<SettingsBackup>() : l.AllBackups.ToList(); bl.Remove(x => x.Time == time); @@ -84,7 +84,7 @@ public static async Task DeleteBackup(DateTime time) public static async Task RenameBackup(DateTime time, string name) { string json = await FileIO.ReadTextAsync(await ApplicationData.Current.LocalFolder.CreateFileAsync("backups.json", CreationCollisionOption.OpenIfExists)); - var l = json.IsNullEmptyOrWhiteSpace() ? new Backups() : JsonConvert.DeserializeObject<Backups>(json); + var l = json.IsNullEmptyOrWhiteSpace() ? new Backups() : JsonSerializer.Deserialize<Backups>(json); var bl = l.AllBackups == null ? new List<SettingsBackup>() : l.AllBackups.ToList(); bl.FirstOrDefault(x => x.Time == time).Name = name; @@ -97,7 +97,7 @@ public static async Task RenameBackup(DateTime time, string name) public static async Task<List<SettingsBackup>> GetBackups() { string json = await FileIO.ReadTextAsync(await ApplicationData.Current.LocalFolder.CreateFileAsync("backups.json", CreationCollisionOption.OpenIfExists)); - var l = json.IsNullEmptyOrWhiteSpace() ? new Backups() : JsonConvert.DeserializeObject<Backups>(json); + var l = json.IsNullEmptyOrWhiteSpace() ? new Backups() : JsonSerializer.Deserialize<Backups>(json); return l.AllBackups == null ? new List<SettingsBackup>() : l.AllBackups.ToList(); } @@ -106,7 +106,7 @@ public static void SaveData() { Settings.LastSaved = DateTime.Now; ApplicationData.Current.RoamingSettings.Values["Settings"] = Settings.Serialize(); - ApplicationData.Current.RoamingSettings.Values["Accounts"] = JsonConvert.SerializeObject(Accounts); + ApplicationData.Current.RoamingSettings.Values["Accounts"] = JsonSerializer.Serialize(Accounts); } } } \ No newline at end of file diff --git a/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs b/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs index aa8b6086..02181bfe 100644 --- a/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs +++ b/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs @@ -5,7 +5,7 @@ using Emerald.WinUI.Models; using Microsoft.Extensions.Logging; using Microsoft.UI.Xaml.Shapes; -using Newtonsoft.Json; +using System.Text.Json; using Octokit; using ProjBobcat.Class.Model; using System; diff --git a/Emerald.Core/Emerald.Core.csproj b/Emerald.Core/Emerald.Core.csproj index 710a97c8..a39329ab 100644 --- a/Emerald.Core/Emerald.Core.csproj +++ b/Emerald.Core/Emerald.Core.csproj @@ -11,6 +11,7 @@ <PackageReference Include="CmlLib.Core" Version="3.3.10" /> <PackageReference Include="CmlLib.Core.Auth.Microsoft" Version="3.0.1" /> <PackageReference Include="ProjBobcat" Version="1.16.0" /> + <PackageReference Include="System.Text.Json" Version="8.0.4" /> </ItemGroup> </Project> \ No newline at end of file diff --git a/Emerald.Core/News/NewsHelper.cs b/Emerald.Core/News/NewsHelper.cs index 09718ca9..dc90f61c 100644 --- a/Emerald.Core/News/NewsHelper.cs +++ b/Emerald.Core/News/NewsHelper.cs @@ -1,4 +1,4 @@ -using Newtonsoft.Json; +using System.Text.Json; using System.Collections.ObjectModel; using System.ComponentModel; @@ -77,7 +77,7 @@ public ObservableCollection<JSON.Entry> Entries response = await wc.GetStringAsync(url); } - var json = JsonConvert.DeserializeObject<JSON.Root>(response); + var json = JsonSerializer.Deserialize<JSON.Root>(response); AllEntries = json?.entries != null ? new(json.entries.ToList()) : new(); Entries.Clear(); diff --git a/Emerald.Core/Optifine.cs b/Emerald.Core/Optifine.cs index 77eceba3..0cf9d52a 100644 --- a/Emerald.Core/Optifine.cs +++ b/Emerald.Core/Optifine.cs @@ -1,5 +1,5 @@ using CmlLib.Core; -using Newtonsoft.Json; +using System.Text.Json; using ProjBobcat.Class.Helper; using ProjBobcat.Class.Model.Optifine; using ProjBobcat.DefaultComponent.Installer; @@ -27,7 +27,7 @@ public async Task<List<OptifineDownloadVersionModel>> GetOptifineVersions() c.Dispose(); - return JsonConvert.DeserializeObject<List<OptifineDownloadVersionModel>>(json); + return JsonSerializer.Deserialize<List<OptifineDownloadVersionModel>>(json); } catch { diff --git a/Emerald.Core/Store/Labrinth.cs b/Emerald.Core/Store/Labrinth.cs index 8a1cc2e5..41ceff86 100644 --- a/Emerald.Core/Store/Labrinth.cs +++ b/Emerald.Core/Store/Labrinth.cs @@ -1,6 +1,6 @@ using CmlLib.Core; using Emerald.Core.Tasks; -using Newtonsoft.Json; +using System.Text.Json; using System.Collections.Specialized; using System.ComponentModel; using System.Net.Http.Headers; @@ -84,7 +84,7 @@ private async void ModrinthDownload(string link, string folderdir, string fileNa var fn = string.IsNullOrEmpty(name) ? "" : $"query={name}"; var url = $"search?{fn}&index={sortOptions.ToString().ToLower()}&facets=[{categouriesString}[\"project_type:mod\"]]&limit={limit}"; var json = await Get(url); - s = JsonConvert.DeserializeObject<Results.SearchResult>(json); + s = JsonSerializer.Deserialize<Results.SearchResult>(json); Tasks.TasksHelper.CompleteTask(taskID, true, name); return s; @@ -104,7 +104,7 @@ private async void ModrinthDownload(string link, string folderdir, string fileNa try { var json = await Get("project/" + id); - s = JsonConvert.DeserializeObject<Results.ModrinthProject>(json); + s = JsonSerializer.Deserialize<Results.ModrinthProject>(json); Tasks.TasksHelper.CompleteTask(taskID, true, name); return s; } @@ -123,7 +123,7 @@ private async void ModrinthDownload(string link, string folderdir, string fileNa try { var json = await Get("project/" + id + "/version"); - s = JsonConvert.DeserializeObject<List<Results.Version>>(json); + s = JsonSerializer.Deserialize<List<Results.Version>>(json); Tasks.TasksHelper.CompleteTask(taskID, true); return s; } diff --git a/Emerald.CoreX/Emerald.CoreX.csproj b/Emerald.CoreX/Emerald.CoreX.csproj index 8f192bc8..60f221b0 100644 --- a/Emerald.CoreX/Emerald.CoreX.csproj +++ b/Emerald.CoreX/Emerald.CoreX.csproj @@ -14,5 +14,6 @@ <PackageReference Include="Microsoft.Extensions.Logging" /> <PackageReference Include="Newtonsoft.Json" /> <PackageReference Include="RestSharp" /> + <PackageReference Include="System.Text.Json" /> </ItemGroup> </Project> \ No newline at end of file diff --git a/Emerald.CoreX/Store/Modrinth/JSON.cs b/Emerald.CoreX/Store/Modrinth/JSON.cs index 53753575..27d7d789 100644 --- a/Emerald.CoreX/Store/Modrinth/JSON.cs +++ b/Emerald.CoreX/Store/Modrinth/JSON.cs @@ -4,19 +4,20 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using Newtonsoft.Json; +using System.Text.Json; +using System.Text.Json.Serialization; namespace Emerald.CoreX.Store.Modrinth.JSON; public class SearchResult { - [JsonProperty("hits")] public List<SearchHit> Hits { get; set; } + [JsonPropertyName("hits")] public List<SearchHit> Hits { get; set; } - [JsonProperty("offset")] public int Offset { get; set; } + [JsonPropertyName("offset")] public int Offset { get; set; } - [JsonProperty("limit")] public int Limit { get; set; } + [JsonPropertyName("limit")] public int Limit { get; set; } - [JsonProperty("total_hits")] public int TotalHits { get; set; } + [JsonPropertyName("total_hits")] public int TotalHits { get; set; } } public class Category @@ -29,96 +30,96 @@ public class Category public class SearchHit { - [JsonProperty("slug")] public string Slug { get; set; } + [JsonPropertyName("slug")] public string Slug { get; set; } - [JsonProperty("title")] public string Title { get; set; } + [JsonPropertyName("title")] public string Title { get; set; } - [JsonProperty("description")] public string Description { get; set; } + [JsonPropertyName("description")] public string Description { get; set; } - [JsonProperty("categories")] public string[] Categories { get; set; } + [JsonPropertyName("categories")] public string[] Categories { get; set; } - [JsonProperty("client_side")] public string ClientSide { get; set; } + [JsonPropertyName("client_side")] public string ClientSide { get; set; } - [JsonProperty("server_side")] public string ServerSide { get; set; } + [JsonPropertyName("server_side")] public string ServerSide { get; set; } - [JsonProperty("project_type")] public string ProjectType { get; set; } + [JsonPropertyName("project_type")] public string ProjectType { get; set; } - [JsonProperty("downloads")] public int Downloads { get; set; } + [JsonPropertyName("downloads")] public int Downloads { get; set; } - [JsonProperty("icon_url")] public string IconUrl { get; set; } + [JsonPropertyName("icon_url")] public string IconUrl { get; set; } - [JsonProperty("project_id")] public string ProjectId { get; set; } + [JsonPropertyName("project_id")] public string ProjectId { get; set; } - [JsonProperty("author")] public string Author { get; set; } + [JsonPropertyName("author")] public string Author { get; set; } - [JsonProperty("versions")] public string[] Versions { get; set; } + [JsonPropertyName("versions")] public string[] Versions { get; set; } - [JsonProperty("follows")] public int Follows { get; set; } + [JsonPropertyName("follows")] public int Follows { get; set; } - [JsonProperty("date_created")] public DateTime DateCreated { get; set; } + [JsonPropertyName("date_created")] public DateTime DateCreated { get; set; } - [JsonProperty("date_modified")] public DateTime DateModified { get; set; } + [JsonPropertyName("date_modified")] public DateTime DateModified { get; set; } - [JsonProperty("latest_version")] public string LatestVersion { get; set; } + [JsonPropertyName("latest_version")] public string LatestVersion { get; set; } - [JsonProperty("license")] public string License { get; set; } + [JsonPropertyName("license")] public string License { get; set; } - [JsonProperty("gallery")] public string[] Gallery { get; set; } + [JsonPropertyName("gallery")] public string[] Gallery { get; set; } } public class StoreItem { - [JsonProperty("id")] public string ID { get; set; } + [JsonPropertyName("id")] public string ID { get; set; } - [JsonProperty("slug")] public string Slug { get; set; } + [JsonPropertyName("slug")] public string Slug { get; set; } - [JsonProperty("project_type")] public string ProjectType { get; set; } + [JsonPropertyName("project_type")] public string ProjectType { get; set; } - [JsonProperty("team")] public string Team { get; set; } + [JsonPropertyName("team")] public string Team { get; set; } - [JsonProperty("title")] public string Title { get; set; } + [JsonPropertyName("title")] public string Title { get; set; } - [JsonProperty("description")] public string Description { get; set; } + [JsonPropertyName("description")] public string Description { get; set; } - [JsonProperty("body")] public string Body { get; set; } + [JsonPropertyName("body")] public string Body { get; set; } - [JsonProperty("body_url")] public string BodyUrl { get; set; } + [JsonPropertyName("body_url")] public string BodyUrl { get; set; } - [JsonProperty("published")] public DateTime PublishedDate { get; set; } + [JsonPropertyName("published")] public DateTime PublishedDate { get; set; } - [JsonProperty("updated")] public DateTime UpdatedDate { get; set; } + [JsonPropertyName("updated")] public DateTime UpdatedDate { get; set; } - [JsonProperty("status")] public string Status { get; set; } + [JsonPropertyName("status")] public string Status { get; set; } - [JsonProperty("moderator_message")] public object? ModeratorMessage { get; set; } + [JsonPropertyName("moderator_message")] public object? ModeratorMessage { get; set; } - [JsonProperty("license")] public License License { get; set; } + [JsonPropertyName("license")] public License License { get; set; } - [JsonProperty("client_side")] public string ClientSide { get; set; } + [JsonPropertyName("client_side")] public string ClientSide { get; set; } - [JsonProperty("server_side")] public string ServerSide { get; set; } + [JsonPropertyName("server_side")] public string ServerSide { get; set; } - [JsonProperty("downloads")] public int Downloads { get; set; } + [JsonPropertyName("downloads")] public int Downloads { get; set; } - [JsonProperty("followers")] public int Followers { get; set; } + [JsonPropertyName("followers")] public int Followers { get; set; } - [JsonProperty("categories")] public string[] Categories { get; set; } + [JsonPropertyName("categories")] public string[] Categories { get; set; } - [JsonProperty("versions")] public string[] Versions { get; set; } + [JsonPropertyName("versions")] public string[] Versions { get; set; } - [JsonProperty("icon_url")] public string IconUrl { get; set; } + [JsonPropertyName("icon_url")] public string IconUrl { get; set; } - [JsonProperty("issues_url")] public string IssuesUrl { get; set; } + [JsonPropertyName("issues_url")] public string IssuesUrl { get; set; } - [JsonProperty("source_url")] public string SourceUrl { get; set; } + [JsonPropertyName("source_url")] public string SourceUrl { get; set; } - [JsonProperty("wiki_url")] public object? WikiUrl { get; set; } + [JsonPropertyName("wiki_url")] public object? WikiUrl { get; set; } - [JsonProperty("discord_url")] public string DiscordUrl { get; set; } + [JsonPropertyName("discord_url")] public string DiscordUrl { get; set; } - [JsonProperty("donation_urls")] public DonationUrls[] DonationUrls { get; set; } + [JsonPropertyName("donation_urls")] public DonationUrls[] DonationUrls { get; set; } - [JsonProperty("gallery")] public object[] Gallery { get; set; } + [JsonPropertyName("gallery")] public object[] Gallery { get; set; } } public class ItemVersion : INotifyPropertyChanged @@ -126,35 +127,35 @@ public class ItemVersion : INotifyPropertyChanged public bool IsDetailsVisible { get; set; } = false; public string? FileName => Files.FirstOrDefault(x => x.Primary)?.Filename; - [JsonProperty("id")] public string ID { get; set; } + [JsonPropertyName("id")] public string ID { get; set; } - [JsonProperty("project_id")] public string ProjectId { get; set; } + [JsonPropertyName("project_id")] public string ProjectId { get; set; } - [JsonProperty("author_id")] public string AuthorId { get; set; } + [JsonPropertyName("author_id")] public string AuthorId { get; set; } - [JsonProperty("featured")] public bool Featured { get; set; } + [JsonPropertyName("featured")] public bool Featured { get; set; } - [JsonProperty("name")] public string Name { get; set; } + [JsonPropertyName("name")] public string Name { get; set; } - [JsonProperty("version_number")] public string VersionNumber { get; set; } + [JsonPropertyName("version_number")] public string VersionNumber { get; set; } - [JsonProperty("changelog")] public string Changelog { get; set; } + [JsonPropertyName("changelog")] public string Changelog { get; set; } - [JsonProperty("changelog_url")] public string? ChangelogUrl { get; set; } + [JsonPropertyName("changelog_url")] public string? ChangelogUrl { get; set; } - [JsonProperty("date_published")] public DateTime DatePublished { get; set; } + [JsonPropertyName("date_published")] public DateTime DatePublished { get; set; } - [JsonProperty("downloads")] public int Downloads { get; set; } + [JsonPropertyName("downloads")] public int Downloads { get; set; } - [JsonProperty("version_type")] public string VersionType { get; set; } + [JsonPropertyName("version_type")] public string VersionType { get; set; } - [JsonProperty("files")] public ItemFile[] Files { get; set; } + [JsonPropertyName("files")] public ItemFile[] Files { get; set; } - [JsonProperty("dependencies")] public Dependency[] Dependencies { get; set; } + [JsonPropertyName("dependencies")] public Dependency[] Dependencies { get; set; } - [JsonProperty("game_versions")] public string[] GameVersions { get; set; } + [JsonPropertyName("game_versions")] public string[] GameVersions { get; set; } - [JsonProperty("loaders")] public string[] Loaders { get; set; } + [JsonPropertyName("loaders")] public string[] Loaders { get; set; } public event PropertyChangedEventHandler? PropertyChanged; @@ -164,49 +165,49 @@ public void InvokePropertyChanged(string? propertyName = null) => public class Dependency { - [JsonProperty("version_id")] public string VersionId { get; set; } + [JsonPropertyName("version_id")] public string VersionId { get; set; } - [JsonProperty("project_id")] public string ProjectId { get; set; } + [JsonPropertyName("project_id")] public string ProjectId { get; set; } - [JsonProperty("file_name")] public string FileName { get; set; } + [JsonPropertyName("file_name")] public string FileName { get; set; } - [JsonProperty("dependency_type")] public string DependencyType { get; set; } + [JsonPropertyName("dependency_type")] public string DependencyType { get; set; } } public class ItemFile { - [JsonProperty("hashes")] public Hashes Hashes { get; set; } + [JsonPropertyName("hashes")] public Hashes Hashes { get; set; } - [JsonProperty("url")] public string Url { get; set; } + [JsonPropertyName("url")] public string Url { get; set; } - [JsonProperty("filename")] public string Filename { get; set; } + [JsonPropertyName("filename")] public string Filename { get; set; } - [JsonProperty("primary")] public bool Primary { get; set; } + [JsonPropertyName("primary")] public bool Primary { get; set; } - [JsonProperty("size")] public int Size { get; set; } + [JsonPropertyName("size")] public int Size { get; set; } } public class Hashes { - [JsonProperty("sha512")] public string Sha512 { get; set; } + [JsonPropertyName("sha512")] public string Sha512 { get; set; } - [JsonProperty("sha1")] public string Sha1 { get; set; } + [JsonPropertyName("sha1")] public string Sha1 { get; set; } } public class License { - [JsonProperty("id")] public string ID { get; set; } + [JsonPropertyName("id")] public string ID { get; set; } - [JsonProperty("name")] public string Name { get; set; } + [JsonPropertyName("name")] public string Name { get; set; } - [JsonProperty("url")] public string Url { get; set; } + [JsonPropertyName("url")] public string Url { get; set; } } public class DonationUrls { - [JsonProperty("id")] public string ID { get; set; } + [JsonPropertyName("id")] public string ID { get; set; } - [JsonProperty("platform")] public string Platform { get; set; } + [JsonPropertyName("platform")] public string Platform { get; set; } - [JsonProperty("url")] public string Url { get; set; } + [JsonPropertyName("url")] public string Url { get; set; } } diff --git a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs index 93320a78..5d09be8a 100644 --- a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs +++ b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs @@ -1,5 +1,5 @@ using CmlLib.Core; -using Newtonsoft.Json; +using System.Text.Json; using RestSharp; using System; using System.Collections.Generic; @@ -37,7 +37,7 @@ public async Task LoadCategoriesAsync() var response = await _client.ExecuteAsync(request); if (response.IsSuccessful) { - var all = JsonConvert.DeserializeObject<List<Category>>(response.Content); + var all = JsonSerializer.Deserialize<List<Category>>(response.Content); var _categories = all .Where(i => i.header == "categories" @@ -87,7 +87,7 @@ public async Task LoadCategoriesAsync() var response = await _client.ExecuteAsync(request); if (response.IsSuccessful) { - var result = JsonConvert.DeserializeObject<SearchResult>(response.Content); + var result = JsonSerializer.Deserialize<SearchResult>(response.Content); _logger.LogInformation($"Search completed successfully. Found {result.TotalHits} {_projectType}s."); return result; } @@ -115,7 +115,7 @@ public async Task LoadCategoriesAsync() if (response.IsSuccessful) { - var item = JsonConvert.DeserializeObject<StoreItem>(response.Content); + var item = JsonSerializer.Deserialize<StoreItem>(response.Content); _logger.LogInformation($"Successfully fetched {_projectType} with ID: {id}"); return item; } @@ -143,7 +143,7 @@ public async Task LoadCategoriesAsync() if (response.IsSuccessful) { - var versions = JsonConvert.DeserializeObject<List<ItemVersion>>(response.Content); + var versions = JsonSerializer.Deserialize<List<ItemVersion>>(response.Content); _logger.LogInformation($"Successfully fetched versions for {_projectType} with ID: {id}"); return versions; } diff --git a/Emerald/Emerald.csproj b/Emerald/Emerald.csproj index 5c40cad7..5e96e83c 100644 --- a/Emerald/Emerald.csproj +++ b/Emerald/Emerald.csproj @@ -40,5 +40,8 @@ ThemeService; </UnoFeatures> </PropertyGroup> + <ItemGroup> + <PackageReference Include="System.Text.Json" /> + </ItemGroup> </Project> From a5737dcad11fb8f130e4695888a7d469a7b10e46 Mon Sep 17 00:00:00 2001 From: Lamparter <notlamparter@outlook.com> Date: Wed, 28 Aug 2024 17:24:31 +0100 Subject: [PATCH 40/61] =?UTF-8?q?=F0=9F=93=B8=20Add=20new=20screenshot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lamparter <notlamparter@outlook.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f12a41c..05d16b5b 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ See [this section](#-building-the-code) ### 📸 Screenshots -[![Emerald screenshot](https://user-images.githubusercontent.com/71598437/212673147-54e79843-76aa-44ff-9db3-60b025334f07.png)](https://github.com/RiversideValley/Emerald) +[![emerald-screenshot](https://github.com/user-attachments/assets/eb65ec6e-3dce-46a9-8f0a-1ffaf9dc43c3)](https://github.com/RiversideValley/Emerald) ## 🦜 Contributing & Feedback From 4744f3ebfae87ed59fe7b7d142caf9a80f60a6a0 Mon Sep 17 00:00:00 2001 From: NoobNotFound <8273016+NoobNotFound@users.noreply.github.com> Date: Fri, 30 Aug 2024 23:06:03 +0530 Subject: [PATCH 41/61] add summaries to Mod stores methods --- Emerald.CoreX/Store/Modrinth/ModrinthStore.cs | 37 +++++++++++++++ Emerald.CoreX/Store/Modrinth/Stores.cs | 45 +++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs index 93320a78..a6132d57 100644 --- a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs +++ b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs @@ -19,6 +19,13 @@ public abstract class ModrinthStore : IMinecraftStore protected readonly ILogger _logger; protected readonly string _projectType; public Category[] Categories { get; private set; } = []; + + /// <summary> + /// Initializes a new instance of the ModrinthStore class. + /// </summary> + /// <param name="path">The Minecraft path.</param> + /// <param name="logger">The logger instance.</param> + /// <param name="projectType">The type of project (e.g., mod, plugin, resourcepack).</param> protected ModrinthStore(MinecraftPath path, ILogger logger, string projectType) { _client = new RestClient("https://api.modrinth.com/v2/"); @@ -28,6 +35,11 @@ protected ModrinthStore(MinecraftPath path, ILogger logger, string projectType) _projectType = projectType; } + + /// <summary> + /// Loads categories for the specified project type from the Modrinth API. + /// </summary> + /// <returns>A task representing the asynchronous operation.</returns> public async Task LoadCategoriesAsync() { var request = new RestRequest("tag/category"); @@ -58,6 +70,15 @@ public async Task LoadCategoriesAsync() _logger.LogError(ex, $"Error occurred while loading {_projectType} categories."); } } + + /// <summary> + /// Searches for items in the Modrinth store based on the provided query and options. + /// </summary> + /// <param name="query">The search query string.</param> + /// <param name="limit">The maximum number of results to return (default is 15).</param> + /// <param name="sortOptions">The sorting options for the search results.</param> + /// <param name="categories">An optional array of category names to filter the results.</param> + /// <returns>A task that represents the asynchronous operation. The task result contains the search results or null if an error occurred.</returns> public virtual async Task<SearchResult?> SearchAsync(string query, int limit = 15, SearchSortOptions sortOptions = SearchSortOptions.Relevance, string[]? categories = null) { @@ -104,6 +125,11 @@ public async Task LoadCategoriesAsync() } } + /// <summary> + /// Retrieves detailed information about a specific item from the Modrinth store. + /// </summary> + /// <param name="id">The unique identifier of the item.</param> + /// <returns>A task that represents the asynchronous operation. The task result contains the item details or null if an error occurred.</returns> public virtual async Task<StoreItem?> GetItemAsync(string id) { _logger.LogInformation($"Fetching {_projectType} with ID: {id}"); @@ -132,6 +158,11 @@ public async Task LoadCategoriesAsync() } } + /// <summary> + /// Retrieves all versions of a specific item from the Modrinth store. + /// </summary> + /// <param name="id">The unique identifier of the item.</param> + /// <returns>A task that represents the asynchronous operation. The task result contains a list of item versions or null if an error occurred.</returns> public virtual async Task<List<ItemVersion>?> GetVersionsAsync(string id) { _logger.LogInformation($"Fetching versions for {_projectType} with ID: {id}"); @@ -160,6 +191,12 @@ public async Task LoadCategoriesAsync() } } + /// <summary> + /// Downloads a specific file for an item from the Modrinth store. + /// </summary> + /// <param name="file">The file information object containing download details.</param> + /// <param name="projectType">The type of project being downloaded (e.g., "mods", "resourcepacks").</param> + /// <returns>A task that represents the asynchronous download operation.</returns> public virtual async Task DownloadItemAsync(ItemFile file, string projectType) { _logger.LogInformation($"Downloading {projectType} file from URL: {file.Url}"); diff --git a/Emerald.CoreX/Store/Modrinth/Stores.cs b/Emerald.CoreX/Store/Modrinth/Stores.cs index ae3c7605..4b1deaae 100644 --- a/Emerald.CoreX/Store/Modrinth/Stores.cs +++ b/Emerald.CoreX/Store/Modrinth/Stores.cs @@ -10,10 +10,19 @@ namespace Emerald.CoreX.Store.Modrinth; public class ModStore : ModrinthStore { + /// <summary> + /// Initializes a new instance of the ModStore class with a custom Minecraft path. + /// </summary> + /// <param name="path">The custom Minecraft path.</param> + /// <param name="logger">The logger instance.</param> public ModStore(MinecraftPath path, ILogger logger) : base(path, logger, "mod") { } + /// <summary> + /// Initializes a new instance of the ModStore class with the default Minecraft path. + /// </summary> + /// <param name="logger">The logger instance.</param> public ModStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) { } @@ -39,10 +48,19 @@ public override async Task DownloadItemAsync(ItemFile file, string projectType) public class PluginStore : ModrinthStore { + /// <summary> + /// Initializes a new instance of the PluginStore class with a custom Minecraft path. + /// </summary> + /// <param name="path">The custom Minecraft path.</param> + /// <param name="logger">The logger instance.</param> public PluginStore(MinecraftPath path, ILogger logger) : base(path, logger, "plugin") { } + /// <summary> + /// Initializes a new instance of the PluginStore class with the default Minecraft path. + /// </summary> + /// <param name="logger">The logger instance.</param> public PluginStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) { } @@ -65,10 +83,19 @@ public override async Task DownloadItemAsync(ItemFile file, string projectType) public class ResourcePackStore : ModrinthStore { + /// <summary> + /// Initializes a new instance of the ResourcePackStore class with a custom Minecraft path. + /// </summary> + /// <param name="path">The custom Minecraft path.</param> + /// <param name="logger">The logger instance.</param> public ResourcePackStore(MinecraftPath path, ILogger logger) : base(path, logger, "resourcepack") { } + /// <summary> + /// Initializes a new instance of the ResourcePackStore class with the default Minecraft path. + /// </summary> + /// <param name="logger">The logger instance.</param> public ResourcePackStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) { } @@ -91,10 +118,19 @@ public override async Task DownloadItemAsync(ItemFile file, string projectType) public class ShaderStore : ModrinthStore { + /// <summary> + /// Initializes a new instance of the ShaderStore class with a custom Minecraft path. + /// </summary> + /// <param name="path">The custom Minecraft path.</param> + /// <param name="logger">The logger instance.</param> public ShaderStore(MinecraftPath path, ILogger logger) : base(path, logger, "shader") { } + /// <summary> + /// Initializes a new instance of the ShaderStore class with the default Minecraft path. + /// </summary> + /// <param name="logger">The logger instance.</param> public ShaderStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) { } @@ -120,10 +156,19 @@ public override async Task DownloadItemAsync(ItemFile file, string projectType) public class ModpackStore : ModrinthStore { + /// <summary> + /// Initializes a new instance of the ModpackStore class with a custom Minecraft path. + /// </summary> + /// <param name="path">The custom Minecraft path.</param> + /// <param name="logger">The logger instance.</param> public ModpackStore(MinecraftPath path, ILogger logger) : base(path, logger, "modpack") { } + /// <summary> + /// Initializes a new instance of the ModpackStore class with the default Minecraft path. + /// </summary> + /// <param name="logger">The logger instance.</param> public ModpackStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefaultPath()), logger) { } From 00254c1068d94d7e0db065aa25e5c04607b33819 Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Fri, 30 Aug 2024 23:20:06 +0530 Subject: [PATCH 42/61] update dependencies --- Directory.Packages.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index f986da2a..19f6fe46 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -11,7 +11,7 @@ <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" /> <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" /> <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" /> - <PackageVersion Include="Octokit" Version="10.0.0" /> + <PackageVersion Include="Octokit" Version="13.0.1" /> <PackageVersion Include="PInvoke.User32" Version="0.7.124" /> <PackageVersion Include="ProjBobcat" Version="1.16.0" /> <PackageVersion Include="System.Text.Json" Version="8.0.4" /> @@ -20,8 +20,8 @@ <!--Emerald.CoreX--> <PackageVersion Include="CmlLib.Core" Version="4.0.2" /> <PackageVersion Include="CmlLib.Core.Auth.Microsoft" Version="3.2.0" /> - <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.6.24327.7" /> + <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0-preview.7.24405.7" /> <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" /> - <PackageVersion Include="RestSharp" Version="111.4.1" /> + <PackageVersion Include="RestSharp" Version="112.0.0" /> </ItemGroup> </Project> \ No newline at end of file From 2f8a808d5d1ffdcf54a4be76788ab10d0eae5c81 Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Sat, 31 Aug 2024 00:07:11 +0530 Subject: [PATCH 43/61] improve the stability of the mod downloader by creating a helper file downloader. --- Emerald.CoreX/Helpers/FileDownloader.cs | 99 +++++++++++++++++++ .../Store/Modrinth/IMinecraftStore.cs | 2 +- Emerald.CoreX/Store/Modrinth/JSON.cs | 8 +- Emerald.CoreX/Store/Modrinth/ModrinthStore.cs | 37 ++----- Emerald.CoreX/Store/Modrinth/Stores.cs | 14 ++- 5 files changed, 120 insertions(+), 40 deletions(-) create mode 100644 Emerald.CoreX/Helpers/FileDownloader.cs diff --git a/Emerald.CoreX/Helpers/FileDownloader.cs b/Emerald.CoreX/Helpers/FileDownloader.cs new file mode 100644 index 00000000..4a2cbd47 --- /dev/null +++ b/Emerald.CoreX/Helpers/FileDownloader.cs @@ -0,0 +1,99 @@ +using System; +using System.IO; +using System.Net.Http; +using System.Security.Cryptography; +using System.Text.Json.Serialization; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; + +namespace Emerald.CoreX.Helpers; + +public class FileDownloader +{ + private readonly ILogger _logger; + private readonly HttpClient _httpClient; + + public FileDownloader(ILogger logger, HttpClient httpClient) + { + _logger = logger; + _httpClient = httpClient; + } + + /// <summary> + /// Downloads a file from the specified URL to the given file path. + /// </summary> + /// <param name="url">The URL of the file to download.</param> + /// <param name="filePath">The path where the file should be saved.</param> + /// <param name="expectedHashes">Optional. The expected hashes for file integrity verification.</param> + /// <param name="progress">Optional. An IProgress{double} to report download progress.</param> + /// <param name="cancellationToken">Optional. A CancellationToken to support cancellation of the download.</param> + /// <returns>A task representing the asynchronous download operation.</returns> + public async Task DownloadFileAsync(string url, string filePath, Hashes? expectedHashes = null, + IProgress<double>? progress = null, CancellationToken cancellationToken = default) + { + _logger.LogInformation($"Downloading file from URL: {url}"); + + try + { + Directory.CreateDirectory(Path.GetDirectoryName(filePath)); + + using var response = await _httpClient.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, cancellationToken); + response.EnsureSuccessStatusCode(); + + var totalBytes = response.Content.Headers.ContentLength ?? -1L; + using var contentStream = await response.Content.ReadAsStreamAsync(cancellationToken); + using var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true); + + var buffer = new byte[8192]; + long totalBytesRead = 0; + int bytesRead; + + while ((bytesRead = await contentStream.ReadAsync(buffer, cancellationToken)) > 0) + { + await fileStream.WriteAsync(buffer.AsMemory(0, bytesRead), cancellationToken); + totalBytesRead += bytesRead; + progress?.Report(totalBytes > 0 ? (double)totalBytesRead / totalBytes : 0); + } + + _logger.LogInformation($"Successfully downloaded file to: {filePath}"); + + if (expectedHashes != null && !await VerifyFileIntegrityAsync(filePath, expectedHashes)) + { + throw new Exception("Downloaded file failed integrity check"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, $"Error occurred while downloading file from URL: {url}"); + throw; + } + } + + /// <summary> + /// Verifies the integrity of a file against expected hashes. + /// </summary> + /// <param name="filePath">The path of the file to verify.</param> + /// <param name="expectedHashes">The expected hashes for the file.</param> + /// <returns>True if the file integrity is verified, false otherwise.</returns> + private async Task<bool> VerifyFileIntegrityAsync(string filePath, Hashes expectedHashes) + { + using var sha1 = SHA1.Create(); + using var sha512 = SHA512.Create(); + using var stream = File.OpenRead(filePath); + + var sha1Hash = BitConverter.ToString(await sha1.ComputeHashAsync(stream)).Replace("-", "").ToLowerInvariant(); + stream.Position = 0; + var sha512Hash = BitConverter.ToString(await sha512.ComputeHashAsync(stream)).Replace("-", "").ToLowerInvariant(); + + return sha1Hash == expectedHashes.Sha1 && sha512Hash == expectedHashes.Sha512; + } +} + + +public class Hashes +{ + [JsonPropertyName("sha512")] public string Sha512 { get; set; } + + [JsonPropertyName("sha1")] public string Sha1 { get; set; } +} diff --git a/Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs b/Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs index 9d61bcea..64f17360 100644 --- a/Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs +++ b/Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs @@ -14,6 +14,6 @@ public interface IMinecraftStore Task<StoreItem?> GetItemAsync(string id); Task<List<ItemVersion>?> GetVersionsAsync(string id); - Task DownloadItemAsync(ItemFile file, string projectType); + Task DownloadItemAsync(ItemFile file, string projectType, IProgress<double>? progress = null, CancellationToken cancellationToken = default); public Category[] Categories { get; } } diff --git a/Emerald.CoreX/Store/Modrinth/JSON.cs b/Emerald.CoreX/Store/Modrinth/JSON.cs index 27d7d789..42bde2e5 100644 --- a/Emerald.CoreX/Store/Modrinth/JSON.cs +++ b/Emerald.CoreX/Store/Modrinth/JSON.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using System.Text.Json; using System.Text.Json.Serialization; +using Emerald.CoreX.Helpers; namespace Emerald.CoreX.Store.Modrinth.JSON; @@ -187,13 +188,6 @@ public class ItemFile [JsonPropertyName("size")] public int Size { get; set; } } -public class Hashes -{ - [JsonPropertyName("sha512")] public string Sha512 { get; set; } - - [JsonPropertyName("sha1")] public string Sha1 { get; set; } -} - public class License { [JsonPropertyName("id")] public string ID { get; set; } diff --git a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs index dd13d418..74ff009f 100644 --- a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs +++ b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs @@ -9,15 +9,17 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Emerald.CoreX.Store.Modrinth.JSON; +using Emerald.CoreX.Helpers; namespace Emerald.CoreX.Store.Modrinth; public abstract class ModrinthStore : IMinecraftStore { protected readonly RestClient _client; - public MinecraftPath MCPath { get; } protected readonly ILogger _logger; protected readonly string _projectType; + protected readonly FileDownloader _fileDownloader; + public MinecraftPath MCPath { get; } public Category[] Categories { get; private set; } = []; /// <summary> @@ -33,6 +35,7 @@ protected ModrinthStore(MinecraftPath path, ILogger logger, string projectType) MCPath = path; _logger = logger; _projectType = projectType; + _fileDownloader = new FileDownloader(logger, new()); } @@ -196,33 +199,13 @@ public async Task LoadCategoriesAsync() /// </summary> /// <param name="file">The file information object containing download details.</param> /// <param name="projectType">The type of project being downloaded (e.g., "mods", "resourcepacks").</param> + /// <param name="progress">Optional. An IProgress{double} to report download progress.</param> + /// <param name="cancellationToken">Optional. A CancellationToken to support cancellation of the download.</param> /// <returns>A task that represents the asynchronous download operation.</returns> - public virtual async Task DownloadItemAsync(ItemFile file, string projectType) + public virtual async Task DownloadItemAsync(ItemFile file, string projectType, + IProgress<double>? progress = null, CancellationToken cancellationToken = default) { - _logger.LogInformation($"Downloading {projectType} file from URL: {file.Url}"); - - try - { - var request = new RestRequest(file.Url); - var response = await _client.ExecuteAsync(request); - if (response.IsSuccessful) - { - var filePath = Path.Combine(MCPath.BasePath, projectType, file.Filename); - Directory.CreateDirectory(Path.GetDirectoryName(filePath)); - await File.WriteAllBytesAsync(filePath, response.RawBytes); - - _logger.LogInformation($"Successfully downloaded {projectType} file to: {filePath}"); - } - else - { - _logger.LogError($"File download failed: {response.ErrorMessage}"); - throw new Exception($"File download failed: {response.ErrorMessage}"); - } - } - catch (Exception ex) - { - _logger.LogError(ex, $"Error occurred while downloading {projectType} file from URL: {file.Url}"); - throw; - } + var filePath = Path.Combine(MCPath.BasePath, projectType, file.Filename); + await _fileDownloader.DownloadFileAsync(file.Url, filePath, file.Hashes, progress, cancellationToken); } } diff --git a/Emerald.CoreX/Store/Modrinth/Stores.cs b/Emerald.CoreX/Store/Modrinth/Stores.cs index 4b1deaae..58e30be4 100644 --- a/Emerald.CoreX/Store/Modrinth/Stores.cs +++ b/Emerald.CoreX/Store/Modrinth/Stores.cs @@ -39,7 +39,7 @@ public ModStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefa return await base.GetVersionsAsync(id); } - public override async Task DownloadItemAsync(ItemFile file, string projectType) + public override async Task DownloadItemAsync(ItemFile file, string projectType, IProgress<double>? progress = null, CancellationToken cancellationToken = default) { // Implement mod-specific download logic await base.DownloadItemAsync(file, "mods"); @@ -75,7 +75,8 @@ public PluginStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSD return await base.GetVersionsAsync(id); } - public override async Task DownloadItemAsync(ItemFile file, string projectType) + public override async Task DownloadItemAsync(ItemFile file, string projectType, + IProgress<double>? progress = null, CancellationToken cancellationToken = default) { await base.DownloadItemAsync(file, "mods"); } @@ -110,7 +111,8 @@ public ResourcePackStore(ILogger logger) : this(new MinecraftPath(MinecraftPath. return await base.GetVersionsAsync(id); } - public override async Task DownloadItemAsync(ItemFile file, string projectType) + public override async Task DownloadItemAsync(ItemFile file, string projectType, + IProgress<double>? progress = null, CancellationToken cancellationToken = default) { await base.DownloadItemAsync(file, "resourcepacks"); } @@ -147,7 +149,8 @@ public ShaderStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSD return await base.GetVersionsAsync(id); } - public override async Task DownloadItemAsync(ItemFile file, string projectType) + public override async Task DownloadItemAsync(ItemFile file, string projectType, + IProgress<double>? progress = null, CancellationToken cancellationToken = default) { // Implement shader-specific download logic await base.DownloadItemAsync(file, "shaders"); @@ -185,7 +188,8 @@ public ModpackStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOS return await base.GetVersionsAsync(id); } - public override async Task DownloadItemAsync(ItemFile file, string projectType) + public override async Task DownloadItemAsync(ItemFile file, string projectType, + IProgress<double>? progress = null, CancellationToken cancellationToken = default) { // Implement modpack-specific download logic await base.DownloadItemAsync(file, "modpacks"); From 6bb99fcf8c8ea69dd5d550a9ba9babb663f0b99d Mon Sep 17 00:00:00 2001 From: Lamparter <notlamparter@outlook.com> Date: Sat, 31 Aug 2024 22:48:04 +0100 Subject: [PATCH 44/61] =?UTF-8?q?=F0=9F=93=9D=20Fix=20grammar=20mistake=20?= =?UTF-8?q?in=20README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lamparter <notlamparter@outlook.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 05d16b5b..7b206fed 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 💎 Emerald -#### A swift Minecraft launcher made using WinUI technologies in the fast C# language really pushes the boundary of the platform. +#### A swift Minecraft launcher made using WinUI technologies in the fast C# language that really pushes the boundary of the platform. <p align="center"> <a title="GitHub Releases" target="_blank" href="https://github.com/RiversideValley/Emerald/releases"> From a41cb824d38df353e1c048552b90a28f2a702e07 Mon Sep 17 00:00:00 2001 From: "codefactor-io[bot]" <47775046+codefactor-io[bot]@users.noreply.github.com> Date: Sun, 1 Sep 2024 17:44:50 +0530 Subject: [PATCH 45/61] [CodeFactor] Apply fixes (#49) Co-authored-by: codefactor-io <support@codefactor.io> --- Emerald.App/Emerald.App/Helpers/Extensions.cs | 12 ++++-------- Emerald.App/Emerald.App/Helpers/Settings/JSON.cs | 5 ----- .../Emerald.App/Helpers/Settings/SettingsSystem.cs | 3 +-- Emerald.App/Emerald.App/Helpers/Updater/Updater.cs | 3 --- Emerald.App/Emerald.App/Helpers/WindowManager.cs | 4 +--- Emerald.App/Emerald.App/MainWindow.xaml.cs | 4 +--- Emerald.App/Emerald.App/Models/Account.cs | 3 +-- Emerald.App/Emerald.App/Models/NavViewHeader.cs | 3 +-- .../UserControls/AdaptiveItemPane.xaml.cs | 2 -- .../Emerald.App/UserControls/ExpanderItem.xaml.cs | 2 -- .../Emerald.App/Views/Home/AccountsPage.xaml.cs | 5 +---- Emerald.App/Emerald.App/Views/Home/HomePage.xaml.cs | 7 +------ Emerald.App/Emerald.App/Views/Home/NewsPage.xaml.cs | 1 - .../Emerald.App/Views/Settings/AboutPage.xaml.cs | 3 +-- .../Views/Settings/AppearancePage.xaml.cs | 3 +-- .../Emerald.App/Views/Settings/GeneralPage.xaml.cs | 6 +----- Emerald.Core/Launcher.cs | 6 +++--- Emerald.Core/News/JSON/Dimensions.cs | 1 - Emerald.Core/News/JSON/Entry.cs | 1 - Emerald.Core/News/NewsHelper.cs | 3 +-- Emerald.Core/Optifine.cs | 4 ++-- Emerald.Core/Store/Labrinth.cs | 12 ++---------- Emerald.Core/Util.cs | 4 ++-- 23 files changed, 24 insertions(+), 73 deletions(-) diff --git a/Emerald.App/Emerald.App/Helpers/Extensions.cs b/Emerald.App/Emerald.App/Helpers/Extensions.cs index 2d61c177..5f0a94d0 100644 --- a/Emerald.App/Emerald.App/Helpers/Extensions.cs +++ b/Emerald.App/Emerald.App/Helpers/Extensions.cs @@ -1,4 +1,4 @@ -using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.Windows.ApplicationModel.Resources; using System; @@ -112,15 +112,11 @@ public static string ToBinaryString(this string str) public static string ToMD5(this string s) { StringBuilder sb = new(); + byte[] hashValue = MD5.HashData(Encoding.UTF8.GetBytes(s)); - using (MD5 md5 = MD5.Create()) + foreach (byte b in hashValue) { - byte[] hashValue = md5.ComputeHash(Encoding.UTF8.GetBytes(s)); - - foreach (byte b in hashValue) - { - sb.Append($"{b:X2}"); - } + sb.Append($"{b:X2}"); } return sb.ToString(); diff --git a/Emerald.App/Emerald.App/Helpers/Settings/JSON.cs b/Emerald.App/Emerald.App/Helpers/Settings/JSON.cs index 8122d468..b639a0c1 100644 --- a/Emerald.App/Emerald.App/Helpers/Settings/JSON.cs +++ b/Emerald.App/Emerald.App/Helpers/Settings/JSON.cs @@ -114,7 +114,6 @@ public class Account : JSON public partial class Downloader : JSON { - [ObservableProperty] private bool _HashCheck; @@ -154,7 +153,6 @@ public JVM() [JsonIgnore] public bool SetSize => !(ScreenSizeStatus == "FullScreen".Localize() || ScreenSizeStatus == "Default".Localize()); - } public class App : JSON @@ -168,11 +166,9 @@ public class App : JSON public bool AutoClose { get; set; } public bool HideOnLaunch { get; set; } public bool WindowsHello { get; set; } - } public class Updates : JSON { - public bool CheckAtStartup { get; set; } = true; public bool AutoDownload { get; set; } public bool IncludePreReleases { get; set; } @@ -297,7 +293,6 @@ public class Store : JSON public partial class StoreSortOptions : JSON { - [ObservableProperty] private bool _Relevance = true; diff --git a/Emerald.App/Emerald.App/Helpers/Settings/SettingsSystem.cs b/Emerald.App/Emerald.App/Helpers/Settings/SettingsSystem.cs index 4e62fd6e..d47d9054 100644 --- a/Emerald.App/Emerald.App/Helpers/Settings/SettingsSystem.cs +++ b/Emerald.App/Emerald.App/Helpers/Settings/SettingsSystem.cs @@ -1,4 +1,4 @@ -using Emerald.WinUI.Helpers.Settings.JSON; +using Emerald.WinUI.Helpers.Settings.JSON; using System.Text.Json; using System; using System.Collections.Generic; @@ -19,7 +19,6 @@ public static T GetSerializedFromSettings<T>(string key, T def) string json; try { - json = ApplicationData.Current.RoamingSettings.Values[key] as string; return JsonSerializer.Deserialize<T>(json); } diff --git a/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs b/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs index 02181bfe..fc74e220 100644 --- a/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs +++ b/Emerald.App/Emerald.App/Helpers/Updater/Updater.cs @@ -93,7 +93,6 @@ public async void CheckForUpdates(bool OnlyInformifHigherAvailable = false) var msg = await MessageBox.Show("UpdateAvailable".Localize(), "## Version: " + ver.ToString() + "\n\n###ReleaseNotes".Localize() + "\n\n " + rel.Body,Enums.MessageBoxButtons.CustomWithCancel, "UpdateNow".Localize()); if(msg == Enums.MessageBoxResults.Cancel) goto Return; - } else if(ver < currentver) { @@ -104,8 +103,6 @@ public async void CheckForUpdates(bool OnlyInformifHigherAvailable = false) var msg = await MessageBox.Show("DowngradeAvailable".Localize(), "DowngradeDescription".Localize(),Enums.MessageBoxButtons.Ok); goto Return; - - } else if(ver == currentver) { diff --git a/Emerald.App/Emerald.App/Helpers/WindowManager.cs b/Emerald.App/Emerald.App/Helpers/WindowManager.cs index 52cbc0ef..0519e1e3 100644 --- a/Emerald.App/Emerald.App/Helpers/WindowManager.cs +++ b/Emerald.App/Emerald.App/Helpers/WindowManager.cs @@ -1,4 +1,4 @@ -using CommunityToolkit.WinUI.Helpers; +using CommunityToolkit.WinUI.Helpers; using Microsoft.UI; using Microsoft.UI.Composition; using Microsoft.UI.Composition.SystemBackdrops; @@ -48,7 +48,6 @@ public static MicaBackground IntializeWindow(Window window) /// <exception cref="NullReferenceException"/> public static void SetTitleBar(Window window, UIElement AppTitleBar) { - FrameworkElement RootUI = (FrameworkElement)window.Content; if (AppWindowTitleBar.IsCustomizationSupported()) { @@ -168,7 +167,6 @@ private void MicaBackground_ActualThemeChanged(FrameworkElement sender, object a { SetConfigurationSourceTheme(); } - } private void SetConfigurationSourceTheme() diff --git a/Emerald.App/Emerald.App/MainWindow.xaml.cs b/Emerald.App/Emerald.App/MainWindow.xaml.cs index 7147aef9..080ee662 100644 --- a/Emerald.App/Emerald.App/MainWindow.xaml.cs +++ b/Emerald.App/Emerald.App/MainWindow.xaml.cs @@ -1,4 +1,4 @@ -using Emerald.Core; +using Emerald.Core; using Emerald.Core.Tasks; using Emerald.WinUI.Helpers; using Emerald.WinUI.Helpers.Settings.JSON; @@ -87,7 +87,6 @@ public async void Initialize(object s, RoutedEventArgs e) if (BackupState.WantBackup) { - var r = await MessageBox.Show( Localized.Error.Localize(), Localized.LoadSettingsFailed.Localize(), @@ -156,7 +155,6 @@ void Tasks() TaskView.ChangeDescription(e.ID, string.Join(" ", (e.Message ?? "").Split(" ").Select(s => s.Localize()))); TaskView.ChangeSeverty(e.ID, e.Success ? InfoBarSeverity.Success : InfoBarSeverity.Error); ShowMiniTask(c, string.Join(" ", (e.Message ?? "").Split(" ").Select(s => s.Localize())), e.Success ? InfoBarSeverity.Success : InfoBarSeverity.Error); - }; } diff --git a/Emerald.App/Emerald.App/Models/Account.cs b/Emerald.App/Emerald.App/Models/Account.cs index 9c09afdb..5efae4e5 100644 --- a/Emerald.App/Emerald.App/Models/Account.cs +++ b/Emerald.App/Emerald.App/Models/Account.cs @@ -1,4 +1,4 @@ -using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using Emerald.Core; using Emerald.WinUI.Enums; using Emerald.WinUI.Helpers; @@ -7,7 +7,6 @@ namespace Emerald.WinUI.Models { public partial class Account : Model { - [ObservableProperty] private string _UserName; diff --git a/Emerald.App/Emerald.App/Models/NavViewHeader.cs b/Emerald.App/Emerald.App/Models/NavViewHeader.cs index e725700e..a2fdde70 100644 --- a/Emerald.App/Emerald.App/Models/NavViewHeader.cs +++ b/Emerald.App/Emerald.App/Models/NavViewHeader.cs @@ -1,11 +1,10 @@ -using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.ComponentModel; using Microsoft.UI.Xaml; namespace Emerald.WinUI.Models { public partial class NavViewHeader : Model { - [ObservableProperty] private string _HeaderText; diff --git a/Emerald.App/Emerald.App/UserControls/AdaptiveItemPane.xaml.cs b/Emerald.App/Emerald.App/UserControls/AdaptiveItemPane.xaml.cs index 84ef0769..8aa58e65 100644 --- a/Emerald.App/Emerald.App/UserControls/AdaptiveItemPane.xaml.cs +++ b/Emerald.App/Emerald.App/UserControls/AdaptiveItemPane.xaml.cs @@ -4,13 +4,11 @@ namespace Emerald.WinUI.UserControls { - /// <summary> /// A nice control from the RiseMP /// </summary> public sealed partial class AdaptiveItemPane : UserControl { - public static DependencyProperty LeftPaneProperty = DependencyProperty.Register("LeftPane", typeof(object), typeof(AdaptiveItemPane), new PropertyMetadata(null)); diff --git a/Emerald.App/Emerald.App/UserControls/ExpanderItem.xaml.cs b/Emerald.App/Emerald.App/UserControls/ExpanderItem.xaml.cs index 8933a8c1..2d219a94 100644 --- a/Emerald.App/Emerald.App/UserControls/ExpanderItem.xaml.cs +++ b/Emerald.App/Emerald.App/UserControls/ExpanderItem.xaml.cs @@ -64,7 +64,5 @@ public Visibility BorderVisibility // Using a DependencyProperty as the backing store for BorderVisibility. This enables animation, styling, binding, etc... public static readonly DependencyProperty BorderVisibilityProperty = DependencyProperty.Register("BorderVisibility", typeof(Visibility), typeof(ExpanderItem), new PropertyMetadata(null)); - - } } diff --git a/Emerald.App/Emerald.App/Views/Home/AccountsPage.xaml.cs b/Emerald.App/Emerald.App/Views/Home/AccountsPage.xaml.cs index e21a2308..84f7669c 100644 --- a/Emerald.App/Emerald.App/Views/Home/AccountsPage.xaml.cs +++ b/Emerald.App/Emerald.App/Views/Home/AccountsPage.xaml.cs @@ -1,4 +1,4 @@ -using CmlLib.Core.Auth; +using CmlLib.Core.Auth; using Emerald.Core; using Emerald.WinUI.Helpers; using Emerald.WinUI.Models; @@ -122,7 +122,6 @@ private void btnSelectAll_Click(object sender, RoutedEventArgs e) item.IsChecked = val; } UpdateAll(); - } private void RemoveSelected() => Accounts.Remove(x => x.IsChecked); @@ -161,7 +160,6 @@ private void CancelLogin_Click(object sender, RoutedEventArgs e) var a = (sender as Button).DataContext as Account; SetEditor(null); Accounts.Add(a); - } public void UpdateMainSource() => SS.Accounts = Accounts.Select(x => @@ -244,7 +242,6 @@ private async void mitMicrosoftAdd_Click(object sender, RoutedEventArgs e) } catch (Exception ex) { - Core.Tasks.TasksHelper.CompleteTask(taskID, false, ex.Message); } } diff --git a/Emerald.App/Emerald.App/Views/Home/HomePage.xaml.cs b/Emerald.App/Emerald.App/Views/Home/HomePage.xaml.cs index ab24c351..f2c077a4 100644 --- a/Emerald.App/Emerald.App/Views/Home/HomePage.xaml.cs +++ b/Emerald.App/Emerald.App/Views/Home/HomePage.xaml.cs @@ -1,4 +1,4 @@ -using CmlLib.Core; +using CmlLib.Core; using CmlLib.Core.Auth; using CmlLib.Core.Downloader; using CommunityToolkit.WinUI.Helpers; @@ -92,7 +92,6 @@ public async void Initialize() var r = await MessageBox.Show("Error".Localize(), "MCPathFailed".Localize().Replace("{Path}", SS.Settings.Minecraft.Path), MessageBoxButtons.CustomWithCancel, "Yes".Localize(), "SetDifMCPath".Localize()); if (r == MessageBoxResults.Cancel) Process.GetCurrentProcess().Kill(); // Application.Current.Exit() didn't kill the process - else if (r == MessageBoxResults.CustomResult2) { var fop = new FolderPicker @@ -106,7 +105,6 @@ public async void Initialize() SS.Settings.Minecraft.Path = f.Path; } } - } App.Current.Launcher.InitializeLauncher(new MinecraftPath(SS.Settings.Minecraft.Path)); @@ -152,7 +150,6 @@ public async void Initialize() if (SystemInformation.Instance.IsFirstRun) ShowTips(); - } public void ShowTips() @@ -262,7 +259,6 @@ void FindSubVers(MinecraftVersion ver) var found = splitText.All((key) => v.Version.ToLower().Contains(key)); if (found) suitableItems.Add(v); - } } @@ -463,7 +459,6 @@ private void AdaptiveItemPane_OnStretched(object sender, EventArgs e) s.Children.OfType<TextBlock>().ToList().ForEach(x => x.HorizontalAlignment = HorizontalAlignment.Left); NewsButton.HorizontalContentAlignment = ChangelogsButton.HorizontalContentAlignment = HorizontalAlignment.Left; - } } } diff --git a/Emerald.App/Emerald.App/Views/Home/NewsPage.xaml.cs b/Emerald.App/Emerald.App/Views/Home/NewsPage.xaml.cs index 0bafae92..0298ea6f 100644 --- a/Emerald.App/Emerald.App/Views/Home/NewsPage.xaml.cs +++ b/Emerald.App/Emerald.App/Views/Home/NewsPage.xaml.cs @@ -27,7 +27,6 @@ public NewsPage() await Task.Delay(300); pnlEmpty.Visibility = App.Current.Launcher.News.Entries.Any() ? Visibility.Collapsed : Visibility.Visible; }; - } private void BackButton_Click(object sender, RoutedEventArgs e) => BackRequested?.Invoke(this, new EventArgs()); diff --git a/Emerald.App/Emerald.App/Views/Settings/AboutPage.xaml.cs b/Emerald.App/Emerald.App/Views/Settings/AboutPage.xaml.cs index 3632cc60..32cb10d4 100644 --- a/Emerald.App/Emerald.App/Views/Settings/AboutPage.xaml.cs +++ b/Emerald.App/Emerald.App/Views/Settings/AboutPage.xaml.cs @@ -1,4 +1,4 @@ -using CommunityToolkit.WinUI.UI.Controls; +using CommunityToolkit.WinUI.UI.Controls; using Emerald.Core; using Emerald.WinUI.Enums; using Emerald.WinUI.Helpers; @@ -102,7 +102,6 @@ private async void ToggleSwitch_Toggled(object sender, RoutedEventArgs e) { SS.Settings.App.WindowsHello = true; } - } private async void DeleteBackup_Click(object sender, RoutedEventArgs e) diff --git a/Emerald.App/Emerald.App/Views/Settings/AppearancePage.xaml.cs b/Emerald.App/Emerald.App/Views/Settings/AppearancePage.xaml.cs index b2d95df1..189fda80 100644 --- a/Emerald.App/Emerald.App/Views/Settings/AppearancePage.xaml.cs +++ b/Emerald.App/Emerald.App/Views/Settings/AppearancePage.xaml.cs @@ -1,4 +1,4 @@ -using Emerald.Core; +using Emerald.Core; using Emerald.WinUI.Helpers; using Microsoft.UI.Xaml.Controls; using System.Collections.ObjectModel; @@ -93,7 +93,6 @@ private void GVColorList_SelectionChanged(object sender, SelectionChangedEventAr private void CustomTintColor_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e) { - var c = SS.Settings.App.Appearance.CustomMicaTintColor; var cp = new ColorPicker() { diff --git a/Emerald.App/Emerald.App/Views/Settings/GeneralPage.xaml.cs b/Emerald.App/Emerald.App/Views/Settings/GeneralPage.xaml.cs index 1fe2010a..be703784 100644 --- a/Emerald.App/Emerald.App/Views/Settings/GeneralPage.xaml.cs +++ b/Emerald.App/Emerald.App/Views/Settings/GeneralPage.xaml.cs @@ -1,4 +1,4 @@ -using CmlLib.Core; +using CmlLib.Core; using Emerald.WinUI.Enums; using Emerald.WinUI.Helpers; using Microsoft.UI.Xaml; @@ -54,10 +54,8 @@ async void Try() Try(); else Start(); - } } - } Start(); } @@ -72,7 +70,5 @@ private void btnRamMinus_Click(object sender, RoutedEventArgs e) => private void btnAutoRAM_Click(object sender, RoutedEventArgs e) => SS.Settings.Minecraft.RAM = DirectResoucres.MaxRAM / 2; - - } } diff --git a/Emerald.Core/Launcher.cs b/Emerald.Core/Launcher.cs index 17ffd0d2..901af079 100644 --- a/Emerald.Core/Launcher.cs +++ b/Emerald.Core/Launcher.cs @@ -1,4 +1,4 @@ -using CmlLib.Core; +using CmlLib.Core; using CmlLib.Core.Downloader; using CmlLib.Core.Files; using CmlLib.Core.Installer.FabricMC; @@ -140,7 +140,7 @@ void ProgChange(object sender, System.ComponentModel.ProgressChangedEventArgs e) prog = e.ProgressPercentage; if (createTask) TasksHelper.EditProgressTask(id, prog, message: message); - }; + } void FileChange(DownloadFileChangedEventArgs e) { @@ -148,7 +148,7 @@ void FileChange(DownloadFileChangedEventArgs e) if (createTask) TasksHelper.EditProgressTask(id, prog, message: message); - }; + } try { diff --git a/Emerald.Core/News/JSON/Dimensions.cs b/Emerald.Core/News/JSON/Dimensions.cs index 7016bea8..54f415af 100644 --- a/Emerald.Core/News/JSON/Dimensions.cs +++ b/Emerald.Core/News/JSON/Dimensions.cs @@ -1,6 +1,5 @@ namespace Emerald.Core.News.JSON { - public class Dimensions { public int width { get; set; } diff --git a/Emerald.Core/News/JSON/Entry.cs b/Emerald.Core/News/JSON/Entry.cs index 908cf4ea..4abbe8df 100644 --- a/Emerald.Core/News/JSON/Entry.cs +++ b/Emerald.Core/News/JSON/Entry.cs @@ -2,7 +2,6 @@ namespace Emerald.Core.News.JSON { - public class Entry { [JsonPropertyName("title")] diff --git a/Emerald.Core/News/NewsHelper.cs b/Emerald.Core/News/NewsHelper.cs index dc90f61c..4965e924 100644 --- a/Emerald.Core/News/NewsHelper.cs +++ b/Emerald.Core/News/NewsHelper.cs @@ -1,4 +1,4 @@ -using System.Text.Json; +using System.Text.Json; using System.Collections.ObjectModel; using System.ComponentModel; @@ -84,7 +84,6 @@ public ObservableCollection<JSON.Entry> Entries foreach (var item in AllEntries.Where(x => filter == null || filter.Contains(x.Category))) Entries.Add(item); - } catch { diff --git a/Emerald.Core/Optifine.cs b/Emerald.Core/Optifine.cs index 0cf9d52a..bc6b1147 100644 --- a/Emerald.Core/Optifine.cs +++ b/Emerald.Core/Optifine.cs @@ -1,4 +1,4 @@ -using CmlLib.Core; +using CmlLib.Core; using System.Text.Json; using ProjBobcat.Class.Helper; using ProjBobcat.Class.Model.Optifine; @@ -49,7 +49,7 @@ public async Task<List<OptifineDownloadVersionModel>> GetOptifineVersions() javaResult.Add(java); } - if (!javaResult.Any()) + if (javaResult.Count == 0) return (false, "NoJRE"); ProgressChanged(this, 0); diff --git a/Emerald.Core/Store/Labrinth.cs b/Emerald.Core/Store/Labrinth.cs index 41ceff86..2b5dadd9 100644 --- a/Emerald.Core/Store/Labrinth.cs +++ b/Emerald.Core/Store/Labrinth.cs @@ -1,4 +1,4 @@ -using CmlLib.Core; +using CmlLib.Core; using Emerald.Core.Tasks; using System.Text.Json; using System.Collections.Specialized; @@ -34,7 +34,6 @@ private async Task<string> Get(string code) return await response.Content.ReadAsStringAsync(); throw new Exception("Failed to GET: \"" + code + "\", StatusCode: " + response.StatusCode.ToString()); - } private int DownloadTaskID; @@ -75,7 +74,7 @@ private async void ModrinthDownload(string link, string folderdir, string fileNa { int taskID = name == "" ? Tasks.TasksHelper.AddTask(Localized.GettingMods) : TasksHelper.AddTask(Localized.SearchStore, name); - string categouriesString = (categories != null && categories.Any() && categories.Length != 15) ? $"[\"categories:{string.Join("\"],[\"categories:", categories)}\"],".ToLower() : ""; + string categouriesString = (categories != null && categories.Length != 0 && categories.Length != 15) ? $"[\"categories:{string.Join("\"],[\"categories:", categories)}\"],".ToLower() : ""; Results.SearchResult s; @@ -163,15 +162,12 @@ public enum SearchCategories Technology, Utility, Worldgen - } } namespace Emerald.Core.Store.Results { - public class File { - [JsonPropertyName("hashes")] public Hashes Hashes { get; set; } @@ -244,7 +240,6 @@ public class Version : INotifyPropertyChanged public class Hashes { - [JsonPropertyName("sha512")] public string Sha512 { get; set; } @@ -254,7 +249,6 @@ public class Hashes public class SearchResult { - [JsonPropertyName("hits")] public Hit[] Hits { get; set; } @@ -270,7 +264,6 @@ public class SearchResult public class Hit { - [JsonPropertyName("slug")] public string Slug { get; set; } @@ -421,7 +414,6 @@ public class License public class Donation_Urls { - [JsonPropertyName("id")] public string ID { get; set; } diff --git a/Emerald.Core/Util.cs b/Emerald.Core/Util.cs index 6c459be6..56b7c2bc 100644 --- a/Emerald.Core/Util.cs +++ b/Emerald.Core/Util.cs @@ -1,4 +1,4 @@ -namespace Emerald.Core +namespace Emerald.Core { public static class Util { @@ -91,7 +91,7 @@ private async Task ProcessContentStream(long? totalDownloadSize, Stream contentS using var fileStream = new FileStream(_destinationFilePath, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true); do { - var bytesRead = await contentStream.ReadAsync(buffer, 0, buffer.Length); + var bytesRead = await contentStream.ReadAsync(buffer); if (bytesRead == 0) { isMoreToRead = false; From 117778b3f37b7a98c4b801ef297e6e025228d529 Mon Sep 17 00:00:00 2001 From: Lamparter <notlamparter@outlook.com> Date: Mon, 2 Sep 2024 11:28:34 +0100 Subject: [PATCH 46/61] =?UTF-8?q?=F0=9F=94=80=20=F0=9F=93=B8=20Add=20hero?= =?UTF-8?q?=20image=20to=20`README.md`=20(#51)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b206fed..f7139fd5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 💎 Emerald +![Emerald Banner](https://github.com/user-attachments/assets/dbe4839c-eddf-49fa-97cc-edbd70b3d81f) #### A swift Minecraft launcher made using WinUI technologies in the fast C# language that really pushes the boundary of the platform. From 3b8b4baa910d6e85d92e5d6af660e55014b72f69 Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Mon, 2 Sep 2024 16:19:12 +0530 Subject: [PATCH 47/61] rename IMinecraftStore to IModrinthStore --- .../Store/Modrinth/IMinecraftStore.cs | 19 ------------------- .../Store/Modrinth/IModrinthStore.cs | 19 +++++++++++++++++++ Emerald.CoreX/Store/Modrinth/ModrinthStore.cs | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs create mode 100644 Emerald.CoreX/Store/Modrinth/IModrinthStore.cs diff --git a/Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs b/Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs deleted file mode 100644 index 64f17360..00000000 --- a/Emerald.CoreX/Store/Modrinth/IMinecraftStore.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Emerald.CoreX.Store.Modrinth.JSON; - -namespace Emerald.CoreX.Store.Modrinth; - -public interface IMinecraftStore -{ - Task<SearchResult?> SearchAsync(string query, int limit = 15, - SearchSortOptions sortOptions = SearchSortOptions.Relevance, string[]? categories = null); - - Task<StoreItem?> GetItemAsync(string id); - Task<List<ItemVersion>?> GetVersionsAsync(string id); - Task DownloadItemAsync(ItemFile file, string projectType, IProgress<double>? progress = null, CancellationToken cancellationToken = default); - public Category[] Categories { get; } -} diff --git a/Emerald.CoreX/Store/Modrinth/IModrinthStore.cs b/Emerald.CoreX/Store/Modrinth/IModrinthStore.cs new file mode 100644 index 00000000..b764f6dc --- /dev/null +++ b/Emerald.CoreX/Store/Modrinth/IModrinthStore.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Emerald.CoreX.Store.Modrinth.JSON; + +namespace Emerald.CoreX.Store.Modrinth; + +public interface IModrinthStore +{ + public Task<SearchResult?> SearchAsync(string query, int limit = 15, + SearchSortOptions sortOptions = SearchSortOptions.Relevance, string[]? categories = null); + public Task LoadCategoriesAsync(); + public Task<StoreItem?> GetItemAsync(string id); + public Task<List<ItemVersion>?> GetVersionsAsync(string id); + public Task DownloadItemAsync(ItemFile file, string projectType, IProgress<double>? progress = null, CancellationToken cancellationToken = default); + public Category[] Categories { get; } +} diff --git a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs index 74ff009f..d905ee27 100644 --- a/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs +++ b/Emerald.CoreX/Store/Modrinth/ModrinthStore.cs @@ -13,7 +13,7 @@ namespace Emerald.CoreX.Store.Modrinth; -public abstract class ModrinthStore : IMinecraftStore +public abstract class ModrinthStore : IModrinthStore { protected readonly RestClient _client; protected readonly ILogger _logger; From 567a20764616a12e573583dc0705821129ace4eb Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Mon, 2 Sep 2024 18:02:25 +0530 Subject: [PATCH 48/61] fix a bug in `CoreX.Helpers.FileDownloader`, `VerifyFileIntegrityAsync` method --- Emerald.CoreX/Helpers/FileDownloader.cs | 45 +++++++++++++++++++------ Emerald.CoreX/Store/Modrinth/Stores.cs | 10 +++--- 2 files changed, 40 insertions(+), 15 deletions(-) diff --git a/Emerald.CoreX/Helpers/FileDownloader.cs b/Emerald.CoreX/Helpers/FileDownloader.cs index 4a2cbd47..8023e4bc 100644 --- a/Emerald.CoreX/Helpers/FileDownloader.cs +++ b/Emerald.CoreX/Helpers/FileDownloader.cs @@ -30,7 +30,7 @@ public FileDownloader(ILogger logger, HttpClient httpClient) /// <param name="cancellationToken">Optional. A CancellationToken to support cancellation of the download.</param> /// <returns>A task representing the asynchronous download operation.</returns> public async Task DownloadFileAsync(string url, string filePath, Hashes? expectedHashes = null, - IProgress<double>? progress = null, CancellationToken cancellationToken = default) + IProgress<double>? progress = null, CancellationToken cancellationToken = default) { _logger.LogInformation($"Downloading file from URL: {url}"); @@ -38,12 +38,18 @@ public async Task DownloadFileAsync(string url, string filePath, Hashes? expecte { Directory.CreateDirectory(Path.GetDirectoryName(filePath)); + // Ensure any existing file is closed before overwriting + if (File.Exists(filePath)) + { + File.Delete(filePath); + } + using var response = await _httpClient.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, cancellationToken); response.EnsureSuccessStatusCode(); var totalBytes = response.Content.Headers.ContentLength ?? -1L; using var contentStream = await response.Content.ReadAsStreamAsync(cancellationToken); - using var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true); + using var fileStream = new FileStream(filePath, FileMode.CreateNew, FileAccess.Write, FileShare.None, 8192, true); var buffer = new byte[8192]; long totalBytesRead = 0; @@ -53,9 +59,11 @@ public async Task DownloadFileAsync(string url, string filePath, Hashes? expecte { await fileStream.WriteAsync(buffer.AsMemory(0, bytesRead), cancellationToken); totalBytesRead += bytesRead; - progress?.Report(totalBytes > 0 ? (double)totalBytesRead / totalBytes : 0); + progress?.Report(totalBytes > 0 ? (double)totalBytesRead / totalBytes * 100 : 0); } + fileStream.Dispose(); + contentStream.Dispose(); _logger.LogInformation($"Successfully downloaded file to: {filePath}"); if (expectedHashes != null && !await VerifyFileIntegrityAsync(filePath, expectedHashes)) @@ -70,6 +78,7 @@ public async Task DownloadFileAsync(string url, string filePath, Hashes? expecte } } + /// <summary> /// Verifies the integrity of a file against expected hashes. /// </summary> @@ -78,16 +87,32 @@ public async Task DownloadFileAsync(string url, string filePath, Hashes? expecte /// <returns>True if the file integrity is verified, false otherwise.</returns> private async Task<bool> VerifyFileIntegrityAsync(string filePath, Hashes expectedHashes) { - using var sha1 = SHA1.Create(); - using var sha512 = SHA512.Create(); - using var stream = File.OpenRead(filePath); + try + { + using var sha1 = SHA1.Create(); + using var sha512 = SHA512.Create(); + + // Open the file with read-only access and allow other processes to read the file + using var stream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read); + + // Compute SHA-1 hash + var sha1Hash = BitConverter.ToString(await sha1.ComputeHashAsync(stream)).Replace("-", "").ToLowerInvariant(); - var sha1Hash = BitConverter.ToString(await sha1.ComputeHashAsync(stream)).Replace("-", "").ToLowerInvariant(); - stream.Position = 0; - var sha512Hash = BitConverter.ToString(await sha512.ComputeHashAsync(stream)).Replace("-", "").ToLowerInvariant(); + // Reset stream position for the next hash computation + stream.Position = 0; - return sha1Hash == expectedHashes.Sha1 && sha512Hash == expectedHashes.Sha512; + // Compute SHA-512 hash + var sha512Hash = BitConverter.ToString(await sha512.ComputeHashAsync(stream)).Replace("-", "").ToLowerInvariant(); + + return sha1Hash == expectedHashes.Sha1 && sha512Hash == expectedHashes.Sha512; + } + catch (Exception ex) + { + _logger.LogError(ex, $"Error occurred during file integrity verification for file: {filePath}"); + throw; + } } + } diff --git a/Emerald.CoreX/Store/Modrinth/Stores.cs b/Emerald.CoreX/Store/Modrinth/Stores.cs index 58e30be4..9f2b48b0 100644 --- a/Emerald.CoreX/Store/Modrinth/Stores.cs +++ b/Emerald.CoreX/Store/Modrinth/Stores.cs @@ -42,7 +42,7 @@ public ModStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSDefa public override async Task DownloadItemAsync(ItemFile file, string projectType, IProgress<double>? progress = null, CancellationToken cancellationToken = default) { // Implement mod-specific download logic - await base.DownloadItemAsync(file, "mods"); + await base.DownloadItemAsync(file, "mods",progress, cancellationToken); } } @@ -78,7 +78,7 @@ public PluginStore(ILogger logger) : this(new MinecraftPath(MinecraftPath.GetOSD public override async Task DownloadItemAsync(ItemFile file, string projectType, IProgress<double>? progress = null, CancellationToken cancellationToken = default) { - await base.DownloadItemAsync(file, "mods"); + await base.DownloadItemAsync(file, "mods", progress, cancellationToken); } } @@ -114,7 +114,7 @@ public ResourcePackStore(ILogger logger) : this(new MinecraftPath(MinecraftPath. public override async Task DownloadItemAsync(ItemFile file, string projectType, IProgress<double>? progress = null, CancellationToken cancellationToken = default) { - await base.DownloadItemAsync(file, "resourcepacks"); + await base.DownloadItemAsync(file, "resourcepacks", progress, cancellationToken); } } @@ -153,7 +153,7 @@ public override async Task DownloadItemAsync(ItemFile file, string projectType, IProgress<double>? progress = null, CancellationToken cancellationToken = default) { // Implement shader-specific download logic - await base.DownloadItemAsync(file, "shaders"); + await base.DownloadItemAsync(file, "shaderpacks", progress, cancellationToken); } } @@ -192,6 +192,6 @@ public override async Task DownloadItemAsync(ItemFile file, string projectType, IProgress<double>? progress = null, CancellationToken cancellationToken = default) { // Implement modpack-specific download logic - await base.DownloadItemAsync(file, "modpacks"); + await base.DownloadItemAsync(file, "modpacks", progress, cancellationToken); } } From 44018f3cd99397f57b11ec79060bd58aa9762ffc Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Mon, 2 Sep 2024 18:26:08 +0530 Subject: [PATCH 49/61] remove unwanted file --- Emerald.CoreX/Modrinth.cs | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 Emerald.CoreX/Modrinth.cs diff --git a/Emerald.CoreX/Modrinth.cs b/Emerald.CoreX/Modrinth.cs deleted file mode 100644 index ecafabd6..00000000 --- a/Emerald.CoreX/Modrinth.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Emerald.CoreX -{ - internal class Modrinth - { - } -} From 889c156e8aa7dc278ee185742c791c02ba19b657 Mon Sep 17 00:00:00 2001 From: Lamparter <notlamparter@outlook.com> Date: Mon, 2 Sep 2024 11:28:34 +0100 Subject: [PATCH 50/61] =?UTF-8?q?=F0=9F=93=B8=20Add=20hero=20image=20to=20?= =?UTF-8?q?`README.md`=20(#51)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b206fed..f7139fd5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 💎 Emerald +![Emerald Banner](https://github.com/user-attachments/assets/dbe4839c-eddf-49fa-97cc-edbd70b3d81f) #### A swift Minecraft launcher made using WinUI technologies in the fast C# language that really pushes the boundary of the platform. From ac232250540a6f38a63e0b6cd89db36d4e99876e Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Sun, 6 Oct 2024 16:12:28 +0530 Subject: [PATCH 51/61] some updates on Uno UI --- Directory.Packages.props | 1 + Emerald/App.xaml.cs | 11 +- Emerald/Assets/icon.png | Bin 0 -> 26146 bytes Emerald/Emerald.csproj | 13 ++ Emerald/Helpers/Extensions.cs | 155 +++++++++++++++ .../MarkupExtensions/ConditionString.cs | 21 +++ Emerald/Helpers/MarkupExtensions/FontIcon.cs | 14 ++ .../MarkupExtensions/LocalizeString.cs | 12 ++ Emerald/Helpers/WindowManager.cs | 176 ++++++++++++++++++ Emerald/MainPage.xaml | 173 ++++++++++++++++- Emerald/MainPage.xaml.cs | 8 + Emerald/Models/Model.cs | 17 ++ Emerald/Models/NavViewHeader.cs | 23 +++ Emerald/Models/SquareNavigationViewItem.cs | 61 ++++++ Emerald/UserControls/Titlebar.xaml | 41 ++++ Emerald/UserControls/Titlebar.xaml.cs | 25 +++ 16 files changed, 742 insertions(+), 9 deletions(-) create mode 100644 Emerald/Assets/icon.png create mode 100644 Emerald/Helpers/Extensions.cs create mode 100644 Emerald/Helpers/MarkupExtensions/ConditionString.cs create mode 100644 Emerald/Helpers/MarkupExtensions/FontIcon.cs create mode 100644 Emerald/Helpers/MarkupExtensions/LocalizeString.cs create mode 100644 Emerald/Helpers/WindowManager.cs create mode 100644 Emerald/Models/Model.cs create mode 100644 Emerald/Models/NavViewHeader.cs create mode 100644 Emerald/Models/SquareNavigationViewItem.cs create mode 100644 Emerald/UserControls/Titlebar.xaml create mode 100644 Emerald/UserControls/Titlebar.xaml.cs diff --git a/Directory.Packages.props b/Directory.Packages.props index 19f6fe46..e55bb4d6 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,6 +9,7 @@ <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" /> <PackageVersion Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" /> <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" /> + <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" /> <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" /> <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" /> <PackageVersion Include="Octokit" Version="13.0.1" /> diff --git a/Emerald/App.xaml.cs b/Emerald/App.xaml.cs index 25e5d31b..4c4e74a9 100644 --- a/Emerald/App.xaml.cs +++ b/Emerald/App.xaml.cs @@ -12,7 +12,7 @@ public App() this.InitializeComponent(); } - protected Window? MainWindow { get; private set; } + public Window? MainWindow { get; private set; } protected IHost? Host { get; private set; } protected override void OnLaunched(LaunchActivatedEventArgs args) @@ -31,6 +31,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args) ); MainWindow = builder.Window; + #if DEBUG MainWindow.EnableHotReload(); #endif @@ -48,6 +49,9 @@ protected override void OnLaunched(LaunchActivatedEventArgs args) // Place the frame in the current Window MainWindow.Content = rootFrame; } +#if WINDOWS + var mica = Emerald.Uno.Helpers.WindowManager.IntializeWindow(MainWindow); +#endif if (rootFrame.Content == null) { @@ -59,4 +63,9 @@ protected override void OnLaunched(LaunchActivatedEventArgs args) // Ensure the current window is active MainWindow.Activate(); } + + /// <summary> + /// Gets the current <see cref="App"/> instance in use + /// </summary> + public new static App Current => (App)Application.Current; } diff --git a/Emerald/Assets/icon.png b/Emerald/Assets/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..94000d9412246469b3f2caa525ad5b7e66a30c52 GIT binary patch literal 26146 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 B6Sn{W literal 0 HcmV?d00001 diff --git a/Emerald/Emerald.csproj b/Emerald/Emerald.csproj index 5e96e83c..77654f5f 100644 --- a/Emerald/Emerald.csproj +++ b/Emerald/Emerald.csproj @@ -41,7 +41,20 @@ </UnoFeatures> </PropertyGroup> <ItemGroup> + <None Remove="Assets\icon.png" /> + <None Remove="UserControls\Titlebar.xaml" /> + </ItemGroup> + <ItemGroup> + <PackageReference Include="Microsoft.Windows.CsWin32"> + <PrivateAssets>all</PrivateAssets> + <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> + </PackageReference> <PackageReference Include="System.Text.Json" /> </ItemGroup> + <ItemGroup> + <Page Update="UserControls\Titlebar.xaml"> + <Generator>MSBuild:Compile</Generator> + </Page> + </ItemGroup> </Project> diff --git a/Emerald/Helpers/Extensions.cs b/Emerald/Helpers/Extensions.cs new file mode 100644 index 00000000..34d20225 --- /dev/null +++ b/Emerald/Helpers/Extensions.cs @@ -0,0 +1,155 @@ +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.Windows.ApplicationModel.Resources; +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Security.Cryptography; +using System.Text; +using Windows.System.Diagnostics; + +namespace Emerald.Uno.Helpers; + +public static class Extensions +{ + private static readonly ConcurrentDictionary<string, string> cachedResources = new(); + + //public static void ShowAt(this TeachingTip tip, FrameworkElement element, TeachingTipPlacementMode placement = TeachingTipPlacementMode.Auto, bool closeWhenClick = true, bool addToMainGrid = true) + //{ + // if (addToMainGrid) + // (App.Current.MainWindow.Content as Grid).Children.Add(tip); + + // tip.Target = element; + // tip.PreferredPlacement = placement; + // tip.IsOpen = true; + // if (closeWhenClick) + // { + // tip.ActionButtonClick += (_, _) => tip.IsOpen = false; + // tip.CloseButtonClick += (_, _) => tip.IsOpen = false; + // } + //} + + public static int GetMemoryGB() + { + SystemMemoryUsageReport systemMemoryUsageReport = SystemDiagnosticInfo.GetForCurrentSystem().MemoryUsage.GetReport(); + + long memkb = Convert.ToInt64(systemMemoryUsageReport.TotalPhysicalSizeInBytes); + return Convert.ToInt32(memkb / Math.Pow(1024, 3)); + } + + public static string KiloFormat(this int num) + { + if (num >= 100000000) + return (num / 1000000).ToString("#,0M"); + + if (num >= 10000000) + return (num / 1000000).ToString("0.#") + "M"; + + if (num >= 100000) + return (num / 1000).ToString("#,0K"); + + if (num >= 1000) + return (num / 100).ToString("0.#") + "K"; + + return num.ToString("#,0"); + } + + //public static ContentDialog ToContentDialog(this UIElement content, string title, string closebtnText = null, ContentDialogButton defaultButton = ContentDialogButton.Close) + //{ + // ContentDialog dialog = new() + // { + // XamlRoot = App.Current.MainWindow.Content.XamlRoot, + // Style = Application.Current.Resources["DefaultContentDialogStyle"] as Style, + // Title = title, + // CloseButtonText = closebtnText, + // DefaultButton = defaultButton, + // Content = content, + // RequestedTheme = (ElementTheme)Settings.SettingsSystem.Settings.App.Appearance.Theme + // }; + // return dialog; + //} + + public static int Remove<T>(this ObservableCollection<T> coll, Func<T, bool> condition) + { + var itemsToRemove = coll.Where(condition).ToList(); + + foreach (var itemToRemove in itemsToRemove) + { + coll.Remove(itemToRemove); + } + return itemsToRemove.Count; + } + + public static int Remove<T>(this List<T> coll, Func<T, bool> condition) + { + var itemsToRemove = coll.Where(condition).ToList(); + + foreach (var itemToRemove in itemsToRemove) + { + coll.Remove(itemToRemove); + } + + return itemsToRemove.Count; + } + public static void AddRange<T>(this ObservableCollection<T> cll, IEnumerable<T> items) + { + foreach (var item in items) + cll.Add(item); + } + + public static string ToBinaryString(this string str) + { + var binary = ""; + foreach (char ch in str) + { + binary += Convert.ToString((int)ch, 2); + } + return binary; + } + + public static string ToMD5(this string s) + { + StringBuilder sb = new(); + byte[] hashValue = MD5.HashData(Encoding.UTF8.GetBytes(s)); + + foreach (byte b in hashValue) + { + sb.Append($"{b:X2}"); + } + + return sb.ToString(); + } + + public static string Localize(this string resourceKey) + { + try + { + string s = Windows.ApplicationModel.Resources.ResourceLoader + .GetForViewIndependentUse() + .GetString(resourceKey); + + return string.IsNullOrEmpty(s) ? resourceKey : s; + } + catch + { + return resourceKey; + } + } + + //public static string Localize(this Core.Localized resourceKey) => + // resourceKey.ToString().Localize(); + + //public static Models.Account ToAccount(this CmlLib.Core.Auth.MSession session, bool plusCount = true) + //{ + // bool isOffline = session.AccessToken == "access_token"; + // return new Models.Account(session.Username, isOffline ? null : session.AccessToken, isOffline ? null : session.UUID, plusCount ? MainWindow.HomePage.AccountsPage.AllCount++ : 0, false, session.ClientToken); + //} + + //public static CmlLib.Core.Auth.MSession ToMSession(this Models.Account account) + //{ + // bool isOffline = account.UUID == null; + // return new CmlLib.Core.Auth.MSession(account.UserName, isOffline ? "access_token" : account.AccessToken, isOffline ? Guid.NewGuid().ToString().Replace("-", "") : account.UUID) { ClientToken = account.ClientToken }; + //} +} diff --git a/Emerald/Helpers/MarkupExtensions/ConditionString.cs b/Emerald/Helpers/MarkupExtensions/ConditionString.cs new file mode 100644 index 00000000..b73a2c3c --- /dev/null +++ b/Emerald/Helpers/MarkupExtensions/ConditionString.cs @@ -0,0 +1,21 @@ +using Microsoft.UI.Xaml.Markup; + +namespace Emerald.Uno.Helpers; + +[MarkupExtensionReturnType(ReturnType = typeof(string))] +public class ConditionString : MarkupExtension +{ + public string TrueString { get; set; } + + public string FalseString { get; set; } + + public bool Condition { get; set; } + + public string Result + => Condition ? TrueString : FalseString; + + public override string ToString() + => Result; + + protected override object ProvideValue() => Result; +} diff --git a/Emerald/Helpers/MarkupExtensions/FontIcon.cs b/Emerald/Helpers/MarkupExtensions/FontIcon.cs new file mode 100644 index 00000000..e9d03396 --- /dev/null +++ b/Emerald/Helpers/MarkupExtensions/FontIcon.cs @@ -0,0 +1,14 @@ +using Microsoft.UI.Xaml.Markup; + +namespace Emerald.Uno.Helpers; + +[MarkupExtensionReturnType(ReturnType = typeof(Microsoft.UI.Xaml.Controls.FontIcon))] +public sealed class FontIcon : MarkupExtension +{ + public string Glyph { get; set; } + + public int FontSize { get; set; } = 16; + + protected override object ProvideValue() + => new Microsoft.UI.Xaml.Controls.FontIcon() { Glyph = Glyph, FontSize = FontSize }; +} diff --git a/Emerald/Helpers/MarkupExtensions/LocalizeString.cs b/Emerald/Helpers/MarkupExtensions/LocalizeString.cs new file mode 100644 index 00000000..31b5689c --- /dev/null +++ b/Emerald/Helpers/MarkupExtensions/LocalizeString.cs @@ -0,0 +1,12 @@ +using Microsoft.UI.Xaml.Markup; +using CommunityToolkit.Mvvm; +namespace Emerald.Uno.Helpers; + +[MarkupExtensionReturnType(ReturnType = typeof(string))] +public sealed class Localize : MarkupExtension +{ + public string Name { get; set; } + + protected override object ProvideValue() + => Name.Localize(); +} diff --git a/Emerald/Helpers/WindowManager.cs b/Emerald/Helpers/WindowManager.cs new file mode 100644 index 00000000..5e16c5ca --- /dev/null +++ b/Emerald/Helpers/WindowManager.cs @@ -0,0 +1,176 @@ +using Microsoft.UI; +using Microsoft.UI.Composition; +using Microsoft.UI.Composition.SystemBackdrops; +using Microsoft.UI.Windowing; +using Microsoft.UI.Xaml; +using System; +using System.Runtime.InteropServices; +using Windows.ApplicationModel; +using WinRT; +using WinRT.Interop; + +namespace Emerald.Uno.Helpers +{ +#if WINDOWS + public static class WindowManager + { + /// <summary> + /// Add mica and the icon to the <paramref name="window"/> + /// </summary> + public static MicaBackground IntializeWindow(Window window) + { + var s = new MicaBackground(window); + s.TrySetMicaBackdrop(); + return s; + } + + /// <summary> + /// Sets the customized titlebar if supported + /// </summary> + /// <exception cref="NullReferenceException"/> + public static void SetTitleBar(Window window, UIElement AppTitleBar) + { + FrameworkElement RootUI = (FrameworkElement)window.Content; + if (AppWindowTitleBar.IsCustomizationSupported()) + { + var titlebar = window.AppWindow.TitleBar; + titlebar.ExtendsContentIntoTitleBar = true; + + void SetColor(ElementTheme acualTheme) + { + titlebar.ButtonBackgroundColor = titlebar.ButtonInactiveBackgroundColor = titlebar.ButtonPressedBackgroundColor = Colors.Transparent; + switch (acualTheme) + { + case ElementTheme.Dark: + titlebar.ButtonHoverBackgroundColor = Colors.Black; + titlebar.ButtonForegroundColor = Colors.White; + titlebar.ButtonHoverForegroundColor = Colors.White; + titlebar.ButtonPressedForegroundColor = Colors.Silver; + break; + case ElementTheme.Light: + titlebar.ButtonHoverBackgroundColor = Colors.White; + titlebar.ButtonForegroundColor = Colors.Black; + titlebar.ButtonHoverForegroundColor = Colors.Black; + titlebar.ButtonPressedForegroundColor = Colors.DarkGray; + break; + } + } + + RootUI.ActualThemeChanged += (s, _) => SetColor(s.ActualTheme); + window.SetTitleBar(AppTitleBar); + SetColor(RootUI.ActualTheme); + } + else + { + window.ExtendsContentIntoTitleBar = true; + window.SetTitleBar(AppTitleBar); + } + } + } + + public class WindowsSystemDispatcherQueueHelper + { + private object? _dispatcherQueueController; + + [StructLayout(LayoutKind.Sequential)] + internal struct DispatcherQueueOptions + { + internal int dwSize; + internal int threadType; + internal int apartmentType; + } + + [DllImport("CoreMessaging.dll")] + private static extern int CreateDispatcherQueueController([In] DispatcherQueueOptions options, [In, Out, MarshalAs(UnmanagedType.IUnknown)] ref object? dispatcherQueueController); + + public void EnsureWindowsSystemDispatcherQueueController() + { + if (Windows.System.DispatcherQueue.GetForCurrentThread() != null) + { + // one already exists, so we'll just use it. + return; + } + + if (_dispatcherQueueController == null) + { + DispatcherQueueOptions options; + options.dwSize = Marshal.SizeOf(typeof(DispatcherQueueOptions)); + options.threadType = 2; + options.apartmentType = 2; + + CreateDispatcherQueueController(options, ref _dispatcherQueueController); + } + } + } + + public class MicaBackground + { + private readonly Window _window; + public readonly MicaController MicaController = new(); + private SystemBackdropConfiguration _backdropConfiguration = new(); + private readonly WindowsSystemDispatcherQueueHelper _dispatcherQueueHelper = new(); + + public MicaBackground(Window window) + { + _window = window; + } + + public bool TrySetMicaBackdrop() + { + if (MicaController.IsSupported()) + { + _dispatcherQueueHelper.EnsureWindowsSystemDispatcherQueueController(); + _window.Activated += WindowOnActivated; + _window.Closed += WindowOnClosed; + ((FrameworkElement)_window.Content).ActualThemeChanged += MicaBackground_ActualThemeChanged; + _backdropConfiguration.IsInputActive = true; + + _backdropConfiguration.Theme = _window.Content switch + { + FrameworkElement { ActualTheme: ElementTheme.Dark } => SystemBackdropTheme.Dark, + FrameworkElement { ActualTheme: ElementTheme.Light } => SystemBackdropTheme.Light, + FrameworkElement { ActualTheme: ElementTheme.Default } => SystemBackdropTheme.Default, + _ => throw new InvalidOperationException("Unknown theme") + }; + + MicaController.AddSystemBackdropTarget(_window.As<ICompositionSupportsSystemBackdrop>()); + MicaController.SetSystemBackdropConfiguration(_backdropConfiguration); + + return true; + } + + return false; + } + + private void MicaBackground_ActualThemeChanged(FrameworkElement sender, object args) + { + if (_backdropConfiguration != null) + { + SetConfigurationSourceTheme(); + } + } + + private void SetConfigurationSourceTheme() + { + switch (((FrameworkElement)_window.Content).ActualTheme) + { + case ElementTheme.Dark: _backdropConfiguration.Theme = SystemBackdropTheme.Dark; break; + case ElementTheme.Light: _backdropConfiguration.Theme = SystemBackdropTheme.Light; break; + case ElementTheme.Default: _backdropConfiguration.Theme = SystemBackdropTheme.Default; break; + } + } + + private void WindowOnClosed(object sender, WindowEventArgs args) + { + MicaController.Dispose(); + _window.Activated -= WindowOnActivated; + _backdropConfiguration = null!; + } + + private void WindowOnActivated(object sender, WindowActivatedEventArgs args) + { + _backdropConfiguration.IsInputActive = args.WindowActivationState is not WindowActivationState.Deactivated; + } + } +#endif +} diff --git a/Emerald/MainPage.xaml b/Emerald/MainPage.xaml index 7145924d..68ff87d4 100644 --- a/Emerald/MainPage.xaml +++ b/Emerald/MainPage.xaml @@ -3,12 +3,169 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:Emerald" xmlns:utu="using:Uno.Toolkit.UI" - Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> - <StackPanel utu:SafeArea.Insets="VisibleBounds" - HorizontalAlignment="Center" - VerticalAlignment="Center"> - <TextBlock AutomationProperties.AutomationId="HelloTextBlock" - Text="Hello Uno Platform" - HorizontalAlignment="Center" /> - </StackPanel> + xmlns:models="using:Emerald.Uno.Models" + xmlns:uc="using:Emerald.Uno.UserControls" + xmlns:helpers="using:Emerald.Uno.Helpers"> + <Grid x:Name="MainGrid"> + <uc:TitleBar + x:Name="AppTitleBar" + Height="48" + Margin="12,0,0,0" + VerticalAlignment="Top" /> + <NavigationView + Background="Transparent" + x:Name="NavView" + Margin="0,48,0,0" + AlwaysShowHeader="True" + IsBackButtonVisible="Collapsed" + IsPaneToggleButtonVisible="False" + IsSettingsVisible="False" + OpenPaneLength="80" + PaneDisplayMode="Left"> + + <NavigationView.HeaderTemplate> + <DataTemplate x:DataType="models:NavViewHeader"> + <Grid Margin="{x:Bind HeaderMargin}" x:DefaultBindMode="OneWay"> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="auto" /> + <ColumnDefinition Width="*" /> + <ColumnDefinition Width="auto" /> + <ColumnDefinition Width="auto" /> + </Grid.ColumnDefinitions> + <TextBlock + Style="{ThemeResource TitleTextBlockStyle}" + Text="{x:Bind HeaderText, Mode=OneWay}" /> + <ContentPresenter + Grid.Column="2" + Margin="0,0,5,0" + Content="{x:Bind CustomContent}" + Visibility="{x:Bind CustomContentVisibility}" /> + <Button + Grid.Column="3" + Margin="0,0,5,0" + Content="{x:Bind CustomButtonText}" + Visibility="{x:Bind CustomButtonVisibility}" /> + </Grid> + </DataTemplate> + </NavigationView.HeaderTemplate> + + <NavigationView.Resources> + <x:Double x:Key="NavigationViewSelectionIndicatorWidth">4</x:Double> + <x:Double x:Key="NavigationViewSelectionIndicatorHeight">24</x:Double> + <x:Double x:Key="NavigationViewSelectionIndicatorRadius">2</x:Double> + <Thickness x:Key="NavigationViewItemContentPresenterMargin">0</Thickness> + </NavigationView.Resources> + + <NavigationView.MenuItemTemplate> + <DataTemplate x:DataType="models:SquareNavigationViewItem"> + <NavigationViewItem + Height="64" + IsEnabled="{x:Bind IsEnabled, Mode=OneWay}" + IsSelected="{x:Bind IsSelected, Mode=TwoWay}" + Tag="{x:Bind Name}"> + <Grid + Margin="-5,4,-9,0" + HorizontalAlignment="Stretch" + VerticalAlignment="Stretch" + x:DefaultBindMode="OneWay" + RowSpacing="2"> + <Grid.RowDefinitions> + <RowDefinition Height="Auto" /> + <RowDefinition Height="Auto" /> + </Grid.RowDefinitions> + <Grid.ChildrenTransitions> + <TransitionCollection> + <RepositionThemeTransition /> + <AddDeleteThemeTransition /> + </TransitionCollection> + </Grid.ChildrenTransitions> + <ContentPresenter + HorizontalAlignment="Right" + VerticalAlignment="Top" + Content="{x:Bind InfoBadge}" /> + <Image + x:Name="Image" + Width="28" + Height="28" + x:Load="{x:Bind ShowThumbnail}" + Source="{x:Bind Thumbnail}" /> + <FontIcon + x:Name="fontIcon" + x:Load="{x:Bind ShowFontIcons}" + Visibility="{x:Bind FontIconVisibility}" + FontSize="22" + Glyph="{x:Bind FontIconGlyph}" /> + <FontIcon + x:Name="fontIconSolid" + x:Load="{x:Bind ShowFontIcons}" + Visibility="{x:Bind SolidFontIconVisibility}" + FontSize="22" + Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}" + Glyph="{x:Bind SolidFontIconGlyph}" /> + <TextBlock + x:Name="txtNavItemName" + Grid.Row="1" + HorizontalAlignment="Center" + x:Load="{x:Bind IsSelected.Equals(x:False)}" + FontSize="10" + Foreground="{ThemeResource ApplicationSecondaryForegroundThemeBrush}" + Style="{StaticResource CaptionTextBlockStyle}" + Text="{x:Bind Name}" /> + </Grid> + </NavigationViewItem> + </DataTemplate> + </NavigationView.MenuItemTemplate> + + <NavigationView.MenuItems> + <models:SquareNavigationViewItem + Name="{helpers:Localize Name=Home}" + SolidFontIconGlyph="" + FontIconGlyph="" + IsSelected="True" + ShowFontIcons="True" + Thumbnail="Assets/NavigationViewIcons/home.png" /> + <models:SquareNavigationViewItem + Name="{helpers:Localize Name=Store}" + FontIconGlyph="" + SolidFontIconGlyph="" + IsSelected="False" + ShowFontIcons="True" + Thumbnail="Assets/NavigationViewIcons/store.png" /> + <models:SquareNavigationViewItem + Name="{helpers:Localize Name=News}" + FontIconGlyph="" + SolidFontIconGlyph="" + IsSelected="False" + ShowFontIcons="True" + Thumbnail="Assets/NavigationViewIcons/news.png" /> + </NavigationView.MenuItems> + + <NavigationView.FooterMenuItems> + <models:SquareNavigationViewItem + Name="{helpers:Localize Name=Tasks}" + FontIconGlyph="" + SolidFontIconGlyph="" + IsSelected="False" + ShowFontIcons="True" + Thumbnail="Assets/NavigationViewIcons/tasks.png" /> + <models:SquareNavigationViewItem + Name="{helpers:Localize Name=Logs}" + FontIconGlyph="" + SolidFontIconGlyph="" + IsSelected="False" + ShowFontIcons="True" + Thumbnail="Assets/NavigationViewIcons/logs.png" /> + <models:SquareNavigationViewItem + Name="{helpers:Localize Name=Settings}" + FontIconGlyph="" + SolidFontIconGlyph="" + IsSelected="False" + ShowFontIcons="True" + Thumbnail="Assets/NavigationViewIcons/settings.png" /> + </NavigationView.FooterMenuItems> + + <Frame x:Name="frame"/> + + </NavigationView> + </Grid> </Page> diff --git a/Emerald/MainPage.xaml.cs b/Emerald/MainPage.xaml.cs index f7f1791c..b118f31e 100644 --- a/Emerald/MainPage.xaml.cs +++ b/Emerald/MainPage.xaml.cs @@ -5,5 +5,13 @@ public sealed partial class MainPage : Page public MainPage() { this.InitializeComponent(); + this.Loaded += MainPage_Loaded; + } + + private void MainPage_Loaded(object sender, RoutedEventArgs e) + { +#if WINDOWS + Emerald.Uno.Helpers.WindowManager.SetTitleBar(App.Current.MainWindow, AppTitleBar); +#endif } } diff --git a/Emerald/Models/Model.cs b/Emerald/Models/Model.cs new file mode 100644 index 00000000..1374d30e --- /dev/null +++ b/Emerald/Models/Model.cs @@ -0,0 +1,17 @@ +using CommunityToolkit.Mvvm.ComponentModel; +using System.ComponentModel; + +namespace Emerald.Uno.Models; + +public partial class Model : ObservableObject +{ + internal void Set<T>(ref T obj, T value, string name = null) + { + SetProperty(ref obj, value, name); + } + + public void InvokePropertyChanged(string name = null) + { + OnPropertyChanged(new PropertyChangedEventArgs(name)); + } +} diff --git a/Emerald/Models/NavViewHeader.cs b/Emerald/Models/NavViewHeader.cs new file mode 100644 index 00000000..97c3ab38 --- /dev/null +++ b/Emerald/Models/NavViewHeader.cs @@ -0,0 +1,23 @@ +using CommunityToolkit.Mvvm.ComponentModel; + +namespace Emerald.Uno.Models; + +public partial class NavViewHeader : Model +{ + [ObservableProperty] + private string _HeaderText; + + [ObservableProperty] + private string _CustomButtonText; + + public Visibility CustomButtonVisibility { get => CustomButtonText == null ? Visibility.Collapsed : Visibility.Visible; } + + + [ObservableProperty] + private string _CustomContent; + + public Visibility CustomContentVisibility { get => CustomContent == null ? Visibility.Collapsed : Visibility.Visible; } + + [ObservableProperty] + private Thickness _HeaderMargin; +} diff --git a/Emerald/Models/SquareNavigationViewItem.cs b/Emerald/Models/SquareNavigationViewItem.cs new file mode 100644 index 00000000..8e3510ed --- /dev/null +++ b/Emerald/Models/SquareNavigationViewItem.cs @@ -0,0 +1,61 @@ +using CommunityToolkit.Mvvm.ComponentModel; + +namespace Emerald.Uno.Models; + +public partial class SquareNavigationViewItem : Model +{ + public SquareNavigationViewItem() + { + PropertyChanged += (_, e) => + { + if (e.PropertyName == nameof(IsSelected) || e.PropertyName == nameof(ShowFontIcons)) + { + InvokePropertyChanged(null); + } + }; + } + public SquareNavigationViewItem(string name, bool isSelected = false, ImageSource image = null, InfoBadge infoBadge = null) + { + Name = name; + IsSelected = isSelected; + Thumbnail = image; + InfoBadge = infoBadge; + PropertyChanged += (_, e) => + { + if (e.PropertyName == nameof(IsSelected) || e.PropertyName == nameof(ShowFontIcons)) + { + InvokePropertyChanged(null); + } + }; + } + + + [ObservableProperty] + private string _Name; + + [ObservableProperty] + private string _FontIconGlyph; + + [ObservableProperty] + private string _SolidFontIconGlyph; + + [ObservableProperty] + private bool _IsSelected; + + [ObservableProperty] + private bool _IsEnabled = true; + + [ObservableProperty] + private ImageSource _Thumbnail; + + [ObservableProperty] + private InfoBadge _InfoBadge; + + [ObservableProperty] + private bool _ShowFontIcons; + + public Visibility FontIconVisibility => ShowFontIcons && !IsSelected ? Visibility.Visible : Visibility.Collapsed; + public Visibility SolidFontIconVisibility => ShowFontIcons && IsSelected ? Visibility.Visible : Visibility.Collapsed; + + public bool ShowThumbnail => !ShowFontIcons; +} diff --git a/Emerald/UserControls/Titlebar.xaml b/Emerald/UserControls/Titlebar.xaml new file mode 100644 index 00000000..2ecadaa5 --- /dev/null +++ b/Emerald/UserControls/Titlebar.xaml @@ -0,0 +1,41 @@ +<UserControl + x:Class="Emerald.Uno.UserControls.TitleBar" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:Emerald.Uno.UserControls" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + mc:Ignorable="d" + d:DesignHeight="300" + d:DesignWidth="400"> + + + <Grid + Height="48" + VerticalAlignment="Top" + Background="Transparent"> + <StackPanel Orientation="Horizontal"> + <Image + x:Name="AppFontIcon" + Width="24" + Height="24" + HorizontalAlignment="Left" + VerticalAlignment="Center" + Source="/Assets/icon.png" /> + <TextBlock + x:Name="AppTitle" + Margin="8,0,0,0" + VerticalAlignment="Center" + Style="{ThemeResource CaptionTextBlockStyle}" + Text="Emerald" /> + <TextBlock + x:Name="PreviewTitle" + Margin="4,0,0,0" + VerticalAlignment="Center" + FontSize="11" + FontWeight="SemiBold" + Foreground="{ThemeResource TextFillColorSecondaryBrush}" + Text="DEV" /> + </StackPanel> + </Grid> +</UserControl> diff --git a/Emerald/UserControls/Titlebar.xaml.cs b/Emerald/UserControls/Titlebar.xaml.cs new file mode 100644 index 00000000..dafb733a --- /dev/null +++ b/Emerald/UserControls/Titlebar.xaml.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; +using Windows.Foundation; +using Windows.Foundation.Collections; + +// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 + +namespace Emerald.Uno.UserControls; +public sealed partial class TitleBar : UserControl +{ + public TitleBar() + { + this.InitializeComponent(); + } +} From c3739c3de5f2cb003ef3a2a35fe4ba65d0807816 Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Mon, 7 Oct 2024 13:58:14 +0530 Subject: [PATCH 52/61] apply fixes for Navview in Uno --- Emerald.App/Emerald.App/Emerald.App.csproj | 1 + Emerald.Core/Emerald.Core.csproj | 1 + Emerald/MainPage.xaml | 48 +--------------------- Emerald/MainPage.xaml.cs | 42 +++++++++++++++++++ Emerald/Models/NavViewHeader.cs | 2 +- Emerald/Models/SquareNavigationViewItem.cs | 1 + 6 files changed, 47 insertions(+), 48 deletions(-) diff --git a/Emerald.App/Emerald.App/Emerald.App.csproj b/Emerald.App/Emerald.App/Emerald.App.csproj index 30fc8280..bfa64968 100644 --- a/Emerald.App/Emerald.App/Emerald.App.csproj +++ b/Emerald.App/Emerald.App/Emerald.App.csproj @@ -12,6 +12,7 @@ <Configurations>Debug;Release</Configurations> <Nullable>enable</Nullable> <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion> + <EnableWindowsTargeting>true</EnableWindowsTargeting> </PropertyGroup> <ItemGroup> diff --git a/Emerald.Core/Emerald.Core.csproj b/Emerald.Core/Emerald.Core.csproj index a39329ab..5417152c 100644 --- a/Emerald.Core/Emerald.Core.csproj +++ b/Emerald.Core/Emerald.Core.csproj @@ -5,6 +5,7 @@ <ImplicitUsings>enable</ImplicitUsings> <Nullable>enable</Nullable> <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally> + <EnableWindowsTargeting>true</EnableWindowsTargeting> </PropertyGroup> <ItemGroup> diff --git a/Emerald/MainPage.xaml b/Emerald/MainPage.xaml index 68ff87d4..6d62c1db 100644 --- a/Emerald/MainPage.xaml +++ b/Emerald/MainPage.xaml @@ -116,53 +116,7 @@ </DataTemplate> </NavigationView.MenuItemTemplate> - <NavigationView.MenuItems> - <models:SquareNavigationViewItem - Name="{helpers:Localize Name=Home}" - SolidFontIconGlyph="" - FontIconGlyph="" - IsSelected="True" - ShowFontIcons="True" - Thumbnail="Assets/NavigationViewIcons/home.png" /> - <models:SquareNavigationViewItem - Name="{helpers:Localize Name=Store}" - FontIconGlyph="" - SolidFontIconGlyph="" - IsSelected="False" - ShowFontIcons="True" - Thumbnail="Assets/NavigationViewIcons/store.png" /> - <models:SquareNavigationViewItem - Name="{helpers:Localize Name=News}" - FontIconGlyph="" - SolidFontIconGlyph="" - IsSelected="False" - ShowFontIcons="True" - Thumbnail="Assets/NavigationViewIcons/news.png" /> - </NavigationView.MenuItems> - - <NavigationView.FooterMenuItems> - <models:SquareNavigationViewItem - Name="{helpers:Localize Name=Tasks}" - FontIconGlyph="" - SolidFontIconGlyph="" - IsSelected="False" - ShowFontIcons="True" - Thumbnail="Assets/NavigationViewIcons/tasks.png" /> - <models:SquareNavigationViewItem - Name="{helpers:Localize Name=Logs}" - FontIconGlyph="" - SolidFontIconGlyph="" - IsSelected="False" - ShowFontIcons="True" - Thumbnail="Assets/NavigationViewIcons/logs.png" /> - <models:SquareNavigationViewItem - Name="{helpers:Localize Name=Settings}" - FontIconGlyph="" - SolidFontIconGlyph="" - IsSelected="False" - ShowFontIcons="True" - Thumbnail="Assets/NavigationViewIcons/settings.png" /> - </NavigationView.FooterMenuItems> + <Frame x:Name="frame"/> diff --git a/Emerald/MainPage.xaml.cs b/Emerald/MainPage.xaml.cs index b118f31e..60677357 100644 --- a/Emerald/MainPage.xaml.cs +++ b/Emerald/MainPage.xaml.cs @@ -1,3 +1,6 @@ +using Emerald.Uno.Helpers; +using Emerald.Uno.Models; + namespace Emerald; public sealed partial class MainPage : Page @@ -13,5 +16,44 @@ private void MainPage_Loaded(object sender, RoutedEventArgs e) #if WINDOWS Emerald.Uno.Helpers.WindowManager.SetTitleBar(App.Current.MainWindow, AppTitleBar); #endif +NavView.MenuItems.Add(new SquareNavigationViewItem("Home".Localize()){ + FontIconGlyph = "\xE80F", + SolidFontIconGlyph = "\xEA8A", + IsSelected = true, + ShowFontIcons = true +}); +NavView.MenuItems.Add(new SquareNavigationViewItem("Store".Localize()){ + FontIconGlyph = "\xE7BF", + SolidFontIconGlyph = "\xE7BF", + IsSelected = false, + ShowFontIcons = true +}); +NavView.MenuItems.Add(new SquareNavigationViewItem("News".Localize()){ + FontIconGlyph = "\xF57E", + SolidFontIconGlyph = "\xF57E", + IsSelected = false, + ShowFontIcons = true +}); + +NavView.FooterMenuItems.Add(new SquareNavigationViewItem("Tasks".Localize()){ + FontIconGlyph = "\xE9D5", + SolidFontIconGlyph = "\xE9D5", + IsSelected = false, + ShowFontIcons = true +}); +NavView.FooterMenuItems.Add(new SquareNavigationViewItem("Logs".Localize()){ + FontIconGlyph = "\xE756", + SolidFontIconGlyph = "\xE756", + IsSelected = false, + ShowFontIcons = true +}); +NavView.FooterMenuItems.Add(new SquareNavigationViewItem("Settings".Localize()){ + FontIconGlyph = "\xE713", + SolidFontIconGlyph = "\xE713", + IsSelected = false, + ShowFontIcons = true +}); + +NavView.SelectedItem = NavView.MenuItems[0]; } } diff --git a/Emerald/Models/NavViewHeader.cs b/Emerald/Models/NavViewHeader.cs index 97c3ab38..6d22e5d5 100644 --- a/Emerald/Models/NavViewHeader.cs +++ b/Emerald/Models/NavViewHeader.cs @@ -2,7 +2,7 @@ namespace Emerald.Uno.Models; -public partial class NavViewHeader : Model +public partial class NavViewHeader : ObservableObject { [ObservableProperty] private string _HeaderText; diff --git a/Emerald/Models/SquareNavigationViewItem.cs b/Emerald/Models/SquareNavigationViewItem.cs index 8e3510ed..2bcbf031 100644 --- a/Emerald/Models/SquareNavigationViewItem.cs +++ b/Emerald/Models/SquareNavigationViewItem.cs @@ -1,3 +1,4 @@ +using System.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel; namespace Emerald.Uno.Models; From 19469e04398e7f3df31af1bb869c02f3fd6079f9 Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Mon, 14 Oct 2024 10:51:10 +0530 Subject: [PATCH 53/61] navbar changes --- Emerald/MainPage.xaml | 4 ++-- Emerald/MainPage.xaml.cs | 8 +++++++- Emerald/Models/NavViewHeader.cs | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Emerald/MainPage.xaml b/Emerald/MainPage.xaml index 6d62c1db..b3dd8b0e 100644 --- a/Emerald/MainPage.xaml +++ b/Emerald/MainPage.xaml @@ -61,7 +61,7 @@ <NavigationViewItem Height="64" IsEnabled="{x:Bind IsEnabled, Mode=OneWay}" - IsSelected="{x:Bind IsSelected, Mode=TwoWay}" + IsSelected="{x:Bind IsSelected, Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Tag="{x:Bind Name}"> <Grid Margin="-5,4,-9,0" @@ -106,7 +106,7 @@ x:Name="txtNavItemName" Grid.Row="1" HorizontalAlignment="Center" - x:Load="{x:Bind IsSelected.Equals(x:False)}" + x:Load="{x:Bind IsSelected.Equals(x:False), Mode=OneWay}" FontSize="10" Foreground="{ThemeResource ApplicationSecondaryForegroundThemeBrush}" Style="{StaticResource CaptionTextBlockStyle}" diff --git a/Emerald/MainPage.xaml.cs b/Emerald/MainPage.xaml.cs index 60677357..529fac90 100644 --- a/Emerald/MainPage.xaml.cs +++ b/Emerald/MainPage.xaml.cs @@ -9,8 +9,14 @@ public MainPage() { this.InitializeComponent(); this.Loaded += MainPage_Loaded; + NavView.ItemInvoked += MainNavigationView_ItemInvoked; } - + private void MainNavigationView_ItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args) + { + if (!args.IsSettingsInvoked && NavView.SelectedItem is SquareNavigationViewItem itm){ + itm.InvokePropertyChanged(); + } + } private void MainPage_Loaded(object sender, RoutedEventArgs e) { #if WINDOWS diff --git a/Emerald/Models/NavViewHeader.cs b/Emerald/Models/NavViewHeader.cs index 6d22e5d5..97c3ab38 100644 --- a/Emerald/Models/NavViewHeader.cs +++ b/Emerald/Models/NavViewHeader.cs @@ -2,7 +2,7 @@ namespace Emerald.Uno.Models; -public partial class NavViewHeader : ObservableObject +public partial class NavViewHeader : Model { [ObservableProperty] private string _HeaderText; From a3228d34ea02ae5a06910fef54ea81935278126d Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Thu, 24 Oct 2024 12:17:23 +0530 Subject: [PATCH 54/61] Fix label not unloading Navviews --- Emerald/App.xaml | 2 ++ Emerald/Helpers/Converters/BoolToVisibility.cs | 18 ++++++++++++++++++ Emerald/MainPage.xaml | 1 + 3 files changed, 21 insertions(+) create mode 100644 Emerald/Helpers/Converters/BoolToVisibility.cs diff --git a/Emerald/App.xaml b/Emerald/App.xaml index eb80f398..4b33ace6 100644 --- a/Emerald/App.xaml +++ b/Emerald/App.xaml @@ -1,6 +1,7 @@ <Application x:Class="Emerald.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:conv="using:Emerald.Helpers.Converters" xmlns:utum="using:Uno.Toolkit.UI.Material"> <Application.Resources> @@ -9,6 +10,7 @@ <!-- Load WinUI resources --> <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" /> <!-- Load Uno.UI.Toolkit resources --> + <conv:BoolToVisibility x:Key="BoolToVisibilty"/> <ToolkitResources xmlns="using:Uno.Toolkit.UI" /> </ResourceDictionary.MergedDictionaries> </ResourceDictionary> diff --git a/Emerald/Helpers/Converters/BoolToVisibility.cs b/Emerald/Helpers/Converters/BoolToVisibility.cs new file mode 100644 index 00000000..c60e4a27 --- /dev/null +++ b/Emerald/Helpers/Converters/BoolToVisibility.cs @@ -0,0 +1,18 @@ + +using Microsoft.UI.Xaml.Data; + +namespace Emerald.Helpers.Converters; +public class BoolToVisibility : IValueConverter + { + public bool Reversed { get; set; } + + public object Convert(object value, Type targetType, object parameter, string language) + { + return (value is bool b) ? (((Reversed || parameter == "reversed") && parameter != "normal") ? (!b ? Visibility.Visible : Visibility.Collapsed) : (b ? Visibility.Visible : Visibility.Collapsed)) : Visibility.Collapsed; + } + + public object ConvertBack(object value, Type targetType, object parameter, string language) + { + throw new InvalidOperationException(); + } + } \ No newline at end of file diff --git a/Emerald/MainPage.xaml b/Emerald/MainPage.xaml index b3dd8b0e..0daa597c 100644 --- a/Emerald/MainPage.xaml +++ b/Emerald/MainPage.xaml @@ -105,6 +105,7 @@ <TextBlock x:Name="txtNavItemName" Grid.Row="1" + Visibility="{x:Bind IsSelected.Equals(x:False), Converter={StaticResource StrToVis}}" HorizontalAlignment="Center" x:Load="{x:Bind IsSelected.Equals(x:False), Mode=OneWay}" FontSize="10" From 4a0fb60b9374a49da82d8b23d46d6e55e6f6da5e Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Mon, 28 Oct 2024 22:31:01 +0530 Subject: [PATCH 55/61] add converters to Uno app --- Emerald/App.xaml | 4 +--- Emerald/MainPage.xaml | 6 +++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Emerald/App.xaml b/Emerald/App.xaml index 4b33ace6..b7b448c4 100644 --- a/Emerald/App.xaml +++ b/Emerald/App.xaml @@ -1,7 +1,6 @@ -<Application x:Class="Emerald.App" +<Application x:Class="Emerald.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:conv="using:Emerald.Helpers.Converters" xmlns:utum="using:Uno.Toolkit.UI.Material"> <Application.Resources> @@ -10,7 +9,6 @@ <!-- Load WinUI resources --> <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" /> <!-- Load Uno.UI.Toolkit resources --> - <conv:BoolToVisibility x:Key="BoolToVisibilty"/> <ToolkitResources xmlns="using:Uno.Toolkit.UI" /> </ResourceDictionary.MergedDictionaries> </ResourceDictionary> diff --git a/Emerald/MainPage.xaml b/Emerald/MainPage.xaml index 0daa597c..120f86b5 100644 --- a/Emerald/MainPage.xaml +++ b/Emerald/MainPage.xaml @@ -5,7 +5,11 @@ xmlns:utu="using:Uno.Toolkit.UI" xmlns:models="using:Emerald.Uno.Models" xmlns:uc="using:Emerald.Uno.UserControls" + xmlns:conv="using:Emerald.Helpers.Converters" xmlns:helpers="using:Emerald.Uno.Helpers"> + <Page.Resources> + <conv:BoolToVisibility x:Key="BoolToVisibilty"/> + </Page.Resources> <Grid x:Name="MainGrid"> <uc:TitleBar x:Name="AppTitleBar" @@ -105,7 +109,7 @@ <TextBlock x:Name="txtNavItemName" Grid.Row="1" - Visibility="{x:Bind IsSelected.Equals(x:False), Converter={StaticResource StrToVis}}" + Visibility="{x:Bind IsSelected.Equals(x:False), Converter={StaticResource BoolToVisibilty}}" HorizontalAlignment="Center" x:Load="{x:Bind IsSelected.Equals(x:False), Mode=OneWay}" FontSize="10" From ddb892dbdb6779045ea7893e7d659cb77addff51 Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Tue, 29 Oct 2024 21:07:02 +0530 Subject: [PATCH 56/61] Rename Emerald namsepace to Emerald.Uno + Some updates --- .../Helpers/MarkupExtensions/FontIcon.cs | 4 +- Emerald.sln | 2 +- Emerald/App.xaml | 5 +- Emerald/App.xaml.cs | 2 +- .../{Emerald.csproj => Emerald.Uno.csproj} | 15 +- .../Helpers/Converters/BoolToVisibility.cs | 2 +- Emerald/Helpers/MarkupExtensions/FontIcon.cs | 2 +- .../Helpers/Settings/Enums/MicaTintColor.cs | 9 + Emerald/Helpers/Settings/JSON.cs | 365 ++++++++++++++++++ Emerald/Helpers/Settings/SettingsSystem.cs | 111 ++++++ Emerald/MainPage.xaml | 13 +- Emerald/MainPage.xaml.cs | 144 +++++-- Emerald/Models/SquareNavigationViewItem.cs | 5 +- Emerald/Package.appxmanifest | 10 +- Emerald/Platforms/Desktop/Program.cs | 2 +- .../Platforms/MacCatalyst/Main.maccatalyst.cs | 2 +- Emerald/Properties/launchSettings.json | 10 +- Emerald/Strings/en/Resources.resw | 2 +- Emerald/UserControls/Titlebar.xaml | 2 +- Emerald/Views/Settings/SettingsPage.xaml | 68 ++++ Emerald/Views/Settings/SettingsPage.xaml.cs | 45 +++ Emerald/app.manifest | 2 +- 22 files changed, 745 insertions(+), 77 deletions(-) rename Emerald/{Emerald.csproj => Emerald.Uno.csproj} (81%) create mode 100644 Emerald/Helpers/Settings/Enums/MicaTintColor.cs create mode 100644 Emerald/Helpers/Settings/JSON.cs create mode 100644 Emerald/Helpers/Settings/SettingsSystem.cs create mode 100644 Emerald/Views/Settings/SettingsPage.xaml create mode 100644 Emerald/Views/Settings/SettingsPage.xaml.cs diff --git a/Emerald.App/Emerald.App/Helpers/MarkupExtensions/FontIcon.cs b/Emerald.App/Emerald.App/Helpers/MarkupExtensions/FontIcon.cs index e32a4597..5b70d088 100644 --- a/Emerald.App/Emerald.App/Helpers/MarkupExtensions/FontIcon.cs +++ b/Emerald.App/Emerald.App/Helpers/MarkupExtensions/FontIcon.cs @@ -1,11 +1,11 @@ -using Microsoft.UI.Xaml.Markup; +using Microsoft.UI.Xaml.Markup; namespace Emerald.WinUI.Helpers { [MarkupExtensionReturnType(ReturnType = typeof(Microsoft.UI.Xaml.Controls.FontIcon))] public sealed class FontIcon : MarkupExtension { - public string Glyph { get; set; } + public string Glyph { get; set; } = "\xe8a5"; public int FontSize { get; set; } = 16; diff --git a/Emerald.sln b/Emerald.sln index bb5184e0..cb5195c2 100644 --- a/Emerald.sln +++ b/Emerald.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.11.35103.136 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emerald", "Emerald\Emerald.csproj", "{9D3213F4-E514-4E7D-872A-725DB4872436}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emerald.Uno", "Emerald\Emerald.Uno.csproj", "{9D3213F4-E514-4E7D-872A-725DB4872436}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3142BDF3-E95C-4F0F-8701-CF981F6EA3C0}" ProjectSection(SolutionItems) = preProject diff --git a/Emerald/App.xaml b/Emerald/App.xaml index b7b448c4..f861592b 100644 --- a/Emerald/App.xaml +++ b/Emerald/App.xaml @@ -1,7 +1,6 @@ -<Application x:Class="Emerald.App" +<Application x:Class="Emerald.Uno.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" - xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:utum="using:Uno.Toolkit.UI.Material"> + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> <Application.Resources> <ResourceDictionary> diff --git a/Emerald/App.xaml.cs b/Emerald/App.xaml.cs index 4c4e74a9..ac07a3cd 100644 --- a/Emerald/App.xaml.cs +++ b/Emerald/App.xaml.cs @@ -1,6 +1,6 @@ using Uno.Resizetizer; -namespace Emerald; +namespace Emerald.Uno; public partial class App : Application { /// <summary> diff --git a/Emerald/Emerald.csproj b/Emerald/Emerald.Uno.csproj similarity index 81% rename from Emerald/Emerald.csproj rename to Emerald/Emerald.Uno.csproj index 77654f5f..9e685211 100644 --- a/Emerald/Emerald.csproj +++ b/Emerald/Emerald.Uno.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Uno.Sdk"> +<Project Sdk="Uno.Sdk"> <PropertyGroup> <TargetFrameworks> net8.0-maccatalyst; @@ -10,9 +10,9 @@ <UnoSingleProject>true</UnoSingleProject> <!-- Display name --> - <ApplicationTitle>Emerald</ApplicationTitle> + <ApplicationTitle>Emerald.Uno</ApplicationTitle> <!-- App Identifier --> - <ApplicationId>Riverside.Emerald</ApplicationId> + <ApplicationId>Riverside.Emerald.Uno</ApplicationId> <!-- Versions --> <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion> <ApplicationVersion>1</ApplicationVersion> @@ -43,6 +43,7 @@ <ItemGroup> <None Remove="Assets\icon.png" /> <None Remove="UserControls\Titlebar.xaml" /> + <None Remove="Views\Settings\SettingsPage.xaml" /> </ItemGroup> <ItemGroup> <PackageReference Include="Microsoft.Windows.CsWin32"> @@ -51,10 +52,18 @@ </PackageReference> <PackageReference Include="System.Text.Json" /> </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Emerald.CoreX\Emerald.CoreX.csproj" /> + </ItemGroup> <ItemGroup> <Page Update="UserControls\Titlebar.xaml"> <Generator>MSBuild:Compile</Generator> </Page> </ItemGroup> + <ItemGroup> + <Page Update="Views\Settings\SettingsPage.xaml"> + <Generator>MSBuild:Compile</Generator> + </Page> + </ItemGroup> </Project> diff --git a/Emerald/Helpers/Converters/BoolToVisibility.cs b/Emerald/Helpers/Converters/BoolToVisibility.cs index c60e4a27..2fafd1c8 100644 --- a/Emerald/Helpers/Converters/BoolToVisibility.cs +++ b/Emerald/Helpers/Converters/BoolToVisibility.cs @@ -1,7 +1,7 @@ using Microsoft.UI.Xaml.Data; -namespace Emerald.Helpers.Converters; +namespace Emerald.Uno.Helpers.Converters; public class BoolToVisibility : IValueConverter { public bool Reversed { get; set; } diff --git a/Emerald/Helpers/MarkupExtensions/FontIcon.cs b/Emerald/Helpers/MarkupExtensions/FontIcon.cs index e9d03396..a7e8c816 100644 --- a/Emerald/Helpers/MarkupExtensions/FontIcon.cs +++ b/Emerald/Helpers/MarkupExtensions/FontIcon.cs @@ -5,7 +5,7 @@ namespace Emerald.Uno.Helpers; [MarkupExtensionReturnType(ReturnType = typeof(Microsoft.UI.Xaml.Controls.FontIcon))] public sealed class FontIcon : MarkupExtension { - public string Glyph { get; set; } + public string Glyph { get; set; } = "\xe8a5"; public int FontSize { get; set; } = 16; diff --git a/Emerald/Helpers/Settings/Enums/MicaTintColor.cs b/Emerald/Helpers/Settings/Enums/MicaTintColor.cs new file mode 100644 index 00000000..4a97fbb6 --- /dev/null +++ b/Emerald/Helpers/Settings/Enums/MicaTintColor.cs @@ -0,0 +1,9 @@ +namespace Emerald.Uno.Helpers.Settings.Enums +{ + public enum MicaTintColor : int + { + NoColor = 0, + AccentColor = 1, + CustomColor = 2 + } +} diff --git a/Emerald/Helpers/Settings/JSON.cs b/Emerald/Helpers/Settings/JSON.cs new file mode 100644 index 00000000..3d1a024a --- /dev/null +++ b/Emerald/Helpers/Settings/JSON.cs @@ -0,0 +1,365 @@ +using CmlLib.Core; +using CommunityToolkit.Mvvm.ComponentModel; +using Microsoft.UI; +using Microsoft.UI.Xaml; +using System.Text.Json; +using System.Text.Json.Serialization; +using System; +using System.Collections.Generic; +using Windows.UI; +using Emerald.CoreX.Store.Modrinth; +namespace Emerald.Uno.Helpers.Settings.JSON; + +public class JSON : Models.Model +{ + public string Serialize() + => JsonSerializer.Serialize(this, new JsonSerializerOptions { WriteIndented = true }); +} + +public class SettingsBackup : JSON +{ + public string Backup { get; set; } + public string Name { get; set; } + public DateTime Time { get; set; } + // ik there is Time.ToString() lol + public string DateString => $"{Time.ToLongDateString()} {Time.ToShortTimeString()}"; +} + +public class Backups : JSON +{ + public SettingsBackup[] AllBackups { get; set; } = Array.Empty<SettingsBackup>(); + public string APIVersion { get; private set; } = "1.0"; +} + +public class Settings : JSON +{ + public static Settings CreateNew() => new() + { + App = new() + { + Discord = new(), + Appearance = new() + { + MicaTintColor = (int)Enums.MicaTintColor.NoColor, + Theme = (int)ElementTheme.Default + } + }, + Minecraft = new() + { + Path = MinecraftPath.GetOSDefaultPath(), + // RAM = DirectResoucres.MaxRAM / 2, + MCVerionsConfiguration = new(), + JVM = new(), + Downloader = new() + { + AssetsCheck = true, + HashCheck = true + } + } + }; + + // public string APIVersion { get; set; } = DirectResoucres.SettingsAPIVersion; + public DateTime LastSaved { get; set; } = DateTime.Now; + public Minecraft Minecraft { get; set; } = new(); + + public App App { get; set; } = new(); +} + +public partial class Minecraft : JSON +{ + public Minecraft() + { + JVM.PropertyChanged += (_, _) + => InvokePropertyChanged(); + PropertyChanged += (_, e) => + { + if (e.PropertyName != null) + InvokePropertyChanged(); + }; + } + + [JsonIgnore] + public double RAMinGB => Math.Round((RAM / 1024.00), 2); + + + [ObservableProperty] + private string _Path; + + [ObservableProperty] + private int _RAM; + + [ObservableProperty] + private bool _IsAdmin; + + public Downloader Downloader { get; set; } = new(); + + public MCVerionsConfiguration MCVerionsConfiguration { get; set; } + + public JVM JVM { get; set; } = new(); + + public bool ReadLogs() + => JVM.GameLogs && !IsAdmin; +} + +public class Account : JSON +{ + public string Type { get; set; } + public string Username { get; set; } + public string AccessToken { get; set; } + public string ClientToken { get; set; } + public string UUID { get; set; } + public bool LastAccessed { get; set; } +} + +public partial class Downloader : JSON +{ + [ObservableProperty] + private bool _HashCheck; + + [ObservableProperty] + private bool _AssetsCheck; +} + +public partial class JVM : JSON +{ + public JVM() + { + this.PropertyChanged += (_, e) => + { + if (e.PropertyName != null) + this.InvokePropertyChanged(); + }; + } + + [ObservableProperty] + private string[] _Arguments; + + [ObservableProperty] + private double _ScreenWidth; + + [ObservableProperty] + private double _ScreenHeight; + + [ObservableProperty] + private bool _FullScreen; + + [ObservableProperty] + private bool _GameLogs; + + [JsonIgnore] + public string ScreenSizeStatus => + FullScreen ? "FullScreen".Localize() : ((ScreenWidth > 0 && ScreenHeight > 0) ? $"{ScreenWidth} × {ScreenHeight}" : "Default".Localize()); + + [JsonIgnore] + public bool SetSize => !(ScreenSizeStatus == "FullScreen".Localize() || ScreenSizeStatus == "Default".Localize()); +} + +public class App : JSON +{ + public Appearance Appearance { get; set; } = new(); + public bool AutoLogin { get; set; } + public Discord Discord { get; set; } = new(); + public NewsFilter NewsFilter { get; set; } = new(); + public Store Store { get; set; } = new(); + public Updates Updates { get; set; } = new(); + public bool AutoClose { get; set; } + public bool HideOnLaunch { get; set; } + public bool WindowsHello { get; set; } +} +public class Updates : JSON +{ + public bool CheckAtStartup { get; set; } = true; + public bool AutoDownload { get; set; } + public bool IncludePreReleases { get; set; } +} +public partial class StoreFilter : JSON +{ + [ObservableProperty] + private bool _Fabric; + + [ObservableProperty] + private bool _Forge; + + [ObservableProperty] + private bool _Adventure; + + [ObservableProperty] + private bool _Cursed; + + [ObservableProperty] + private bool _Decoration; + + [ObservableProperty] + private bool _Equipment; + + [ObservableProperty] + private bool _Food; + + [ObservableProperty] + private bool _Library; + + [ObservableProperty] + private bool _Magic; + + [ObservableProperty] + private bool _Misc; + + [ObservableProperty] + private bool _Optimization; + + [ObservableProperty] + private bool _Storage; + + [ObservableProperty] + private bool _Technology; + + [ObservableProperty] + private bool _Utility; + + [ObservableProperty] + private bool _Worldgen; + + [JsonIgnore] + public bool All + { + get =>true; + set + { + _Fabric = _Forge = _Adventure = _Cursed = _Decoration = _Equipment = _Food = _Library = _Magic = _Misc = _Optimization = _Storage = _Technology = _Utility = _Worldgen = false; + InvokePropertyChanged(null); + } + } +} +public class Store : JSON +{ + public StoreFilter Filter { get; set; } = new(); + public StoreSortOptions SortOptions { get; set; } = new(); +} + +public partial class StoreSortOptions : JSON +{ + [ObservableProperty] + private bool _Relevance = true; + + [ObservableProperty] + private bool _Downloads; + + [ObservableProperty] + private bool _Follows; + + [ObservableProperty] + private bool _Updated; + + [ObservableProperty] + private bool _Newest; + + public SearchSortOptions GetResult() + { + if (!(Relevance || Downloads || Follows || Updated || Newest)) + return SearchSortOptions.Relevance; + else + return Relevance ? SearchSortOptions.Relevance : (Downloads ? SearchSortOptions.Downloads : (Follows ? SearchSortOptions.Follows : (Updated ? SearchSortOptions.Updated : SearchSortOptions.Newest))); + } +} +public partial class NewsFilter : JSON +{ + [ObservableProperty] + private bool _Java = false; + + [ObservableProperty] + private bool _Bedrock = false; + + [ObservableProperty] + private bool _Dungeons = false; + + [ObservableProperty] + private bool _Legends = false; + + [JsonIgnore] + public bool All + { + get => GetResult().Length == 4; + set + { + Java = Bedrock = Dungeons = Legends = false; + InvokePropertyChanged(null); + } + } + public string[] GetResult() + { + var r = new List<string>(); + + if (!Java && !Bedrock && !Dungeons && !Legends) + { + r.Add("Minecraft: Java Edition"); + r.Add("Minecraft for Windows"); + r.Add("Minecraft Dungeons"); + r.Add("Minecraft Legends"); + return r.ToArray(); + } + + if (Java) + r.Add("Minecraft: Java Edition"); + + if (Bedrock) + r.Add("Minecraft for Windows"); + + if (Dungeons) + r.Add("Minecraft Dungeons"); + + if (Legends) + r.Add("Minecraft Legends"); + + return r.ToArray(); + } +} +public class Discord : JSON +{ +} +public partial class MCVerionsConfiguration : JSON +{ + [ObservableProperty] + private bool _Release = true; + + [ObservableProperty] + private bool _Custom = false; + + [ObservableProperty] + private bool _OldBeta = false; + + [ObservableProperty] + private bool _OldAlpha = false; + + [ObservableProperty] + private bool _Snapshot = false; +} + +public partial class Appearance : JSON +{ + [ObservableProperty] + private int _NavIconType = 1; + + public bool ShowFontIcons => NavIconType == 0; + + [ObservableProperty] + private int _Theme; + + [ObservableProperty] + private int _MicaTintColor; + + [ObservableProperty] + private int _MicaType = 0; + + [ObservableProperty] + private (int A, int R, int G, int B)? _CustomMicaTintColor; + + + public Appearance() + { + this.PropertyChanged += (_, e) => + { + if (e.PropertyName != null) + this.InvokePropertyChanged(); + }; + } +} diff --git a/Emerald/Helpers/Settings/SettingsSystem.cs b/Emerald/Helpers/Settings/SettingsSystem.cs new file mode 100644 index 00000000..53d3c565 --- /dev/null +++ b/Emerald/Helpers/Settings/SettingsSystem.cs @@ -0,0 +1,111 @@ +using Emerald.Uno.Helpers.Settings.JSON; +using System.Text.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Windows.Storage; + +namespace Emerald.Uno.Helpers.Settings; + +public static class SettingsSystem +{ + public static JSON.Settings Settings { get; private set; } = JSON.Settings.CreateNew(); + public static Account[] Accounts { get; set; } + + public static event EventHandler<string>? APINoMatch; +// public static T GetSerializedFromSettings<T>(string key, T def) +// { +// string json; +// try +// { +// json = ApplicationData.Current.RoamingSettings.Values[key] as string; +// return JsonSerializer.Deserialize<T>(json); +// } +// catch +// { +// json = JsonSerializer.Serialize(def); +// ApplicationData.Current.RoamingSettings.Values[key] = json; +// return def; +// } +// } +// public static void LoadData() +// { +// Settings = GetSerializedFromSettings("Settings", JSON.Settings.CreateNew()); +// Accounts = GetSerializedFromSettings("Accounts", Array.Empty<Account>()); + +// if (Settings.APIVersion != DirectResoucres.SettingsAPIVersion) +// { +// APINoMatch?.Invoke(null, ApplicationData.Current.RoamingSettings.Values["Settings"] as string); +// ApplicationData.Current.RoamingSettings.Values["Settings"] = JSON.Settings.CreateNew().Serialize(); +// Settings = JsonSerializer.Deserialize<JSON.Settings>(ApplicationData.Current.RoamingSettings.Values["Settings"] as string); +// } +// } + +// public static async Task CreateBackup(string system) +// { +// string json = await FileIO.ReadTextAsync(await ApplicationData.Current.LocalFolder.CreateFileAsync("backups.json", CreationCollisionOption.OpenIfExists)); +// var l = json.IsNullEmptyOrWhiteSpace() ? new Backups() : JsonSerializer.Deserialize<Backups>(json); + +// var bl = l.AllBackups == null ? new List<SettingsBackup>() : l.AllBackups.ToList(); +// bl.Add(new SettingsBackup() { Time = DateTime.Now, Backup = system }); +// l.AllBackups = bl.ToArray(); +// json = l.Serialize(); + +// await FileIO.WriteTextAsync(await ApplicationData.Current.LocalFolder.CreateFileAsync("backups.json", CreationCollisionOption.OpenIfExists), json); +// } + +// public static async Task DeleteBackup(int Index) +// { +// string json = await FileIO.ReadTextAsync(await ApplicationData.Current.LocalFolder.CreateFileAsync("backups.json", CreationCollisionOption.OpenIfExists)); +// var l = json.IsNullEmptyOrWhiteSpace() ? new Backups() : JsonSerializer.Deserialize<Backups>(json); + +// var bl = l.AllBackups == null ? new List<SettingsBackup>() : l.AllBackups.ToList(); +// bl.RemoveAt(Index); +// l.AllBackups = bl.ToArray(); +// json = l.Serialize(); + +// await FileIO.WriteTextAsync(await ApplicationData.Current.LocalFolder.CreateFileAsync("backups.json", CreationCollisionOption.OpenIfExists), json); +// } + +// public static async Task DeleteBackup(DateTime time) +// { +// string json = await FileIO.ReadTextAsync(await ApplicationData.Current.LocalFolder.CreateFileAsync("backups.json", CreationCollisionOption.OpenIfExists)); +// var l = json.IsNullEmptyOrWhiteSpace() ? new Backups() : JsonSerializer.Deserialize<Backups>(json); + +// var bl = l.AllBackups == null ? new List<SettingsBackup>() : l.AllBackups.ToList(); +// bl.Remove(x => x.Time == time); +// l.AllBackups = bl.ToArray(); +// json = l.Serialize(); + +// await FileIO.WriteTextAsync(await ApplicationData.Current.LocalFolder.CreateFileAsync("backups.json", CreationCollisionOption.OpenIfExists), json); +// } +// public static async Task RenameBackup(DateTime time, string name) +// { +// string json = await FileIO.ReadTextAsync(await ApplicationData.Current.LocalFolder.CreateFileAsync("backups.json", CreationCollisionOption.OpenIfExists)); +// var l = json.IsNullEmptyOrWhiteSpace() ? new Backups() : JsonSerializer.Deserialize<Backups>(json); + +// var bl = l.AllBackups == null ? new List<SettingsBackup>() : l.AllBackups.ToList(); +// bl.FirstOrDefault(x => x.Time == time).Name = name; +// l.AllBackups = bl.ToArray(); +// json = l.Serialize(); + +// await FileIO.WriteTextAsync(await ApplicationData.Current.LocalFolder.CreateFileAsync("backups.json", CreationCollisionOption.OpenIfExists), json); +// } + +// public static async Task<List<SettingsBackup>> GetBackups() +// { +// string json = await FileIO.ReadTextAsync(await ApplicationData.Current.LocalFolder.CreateFileAsync("backups.json", CreationCollisionOption.OpenIfExists)); +// var l = json.IsNullEmptyOrWhiteSpace() ? new Backups() : JsonSerializer.Deserialize<Backups>(json); + +// return l.AllBackups == null ? new List<SettingsBackup>() : l.AllBackups.ToList(); +// } + +// public static void SaveData() +// { +// Settings.LastSaved = DateTime.Now; +// ApplicationData.Current.RoamingSettings.Values["Settings"] = Settings.Serialize(); +// ApplicationData.Current.RoamingSettings.Values["Accounts"] = JsonSerializer.Serialize(Accounts); +// } +//} +} diff --git a/Emerald/MainPage.xaml b/Emerald/MainPage.xaml index 120f86b5..09b5233f 100644 --- a/Emerald/MainPage.xaml +++ b/Emerald/MainPage.xaml @@ -1,11 +1,11 @@ -<Page x:Class="Emerald.MainPage" +<Page x:Class="Emerald.Uno.MainPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:local="using:Emerald" + xmlns:local="using:Emerald.Uno" xmlns:utu="using:Uno.Toolkit.UI" xmlns:models="using:Emerald.Uno.Models" xmlns:uc="using:Emerald.Uno.UserControls" - xmlns:conv="using:Emerald.Helpers.Converters" + xmlns:conv="using:Emerald.Uno.Helpers.Converters" xmlns:helpers="using:Emerald.Uno.Helpers"> <Page.Resources> <conv:BoolToVisibility x:Key="BoolToVisibilty"/> @@ -18,6 +18,7 @@ VerticalAlignment="Top" /> <NavigationView Background="Transparent" + ItemInvoked="navView_ItemInvoked" x:Name="NavView" Margin="0,48,0,0" AlwaysShowHeader="True" @@ -52,11 +53,11 @@ </Grid> </DataTemplate> </NavigationView.HeaderTemplate> - + <NavigationView.Resources> <x:Double x:Key="NavigationViewSelectionIndicatorWidth">4</x:Double> <x:Double x:Key="NavigationViewSelectionIndicatorHeight">24</x:Double> - <x:Double x:Key="NavigationViewSelectionIndicatorRadius">2</x:Double> + <x:Double x:Key="NavigationViewSelectionIndicatorRadius">4</x:Double> <Thickness x:Key="NavigationViewItemContentPresenterMargin">0</Thickness> </NavigationView.Resources> @@ -109,7 +110,7 @@ <TextBlock x:Name="txtNavItemName" Grid.Row="1" - Visibility="{x:Bind IsSelected.Equals(x:False), Converter={StaticResource BoolToVisibilty}}" + Visibility="{x:Bind SelectionVisibility}" HorizontalAlignment="Center" x:Load="{x:Bind IsSelected.Equals(x:False), Mode=OneWay}" FontSize="10" diff --git a/Emerald/MainPage.xaml.cs b/Emerald/MainPage.xaml.cs index 529fac90..5a8a742b 100644 --- a/Emerald/MainPage.xaml.cs +++ b/Emerald/MainPage.xaml.cs @@ -1,7 +1,10 @@ using Emerald.Uno.Helpers; using Emerald.Uno.Models; +using Emerald.Uno.Views.Settings; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Media.Animation; -namespace Emerald; +namespace Emerald.Uno; public sealed partial class MainPage : Page { @@ -11,55 +14,112 @@ public MainPage() this.Loaded += MainPage_Loaded; NavView.ItemInvoked += MainNavigationView_ItemInvoked; } - private void MainNavigationView_ItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args) + private void MainNavigationView_ItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args) + { + if (!args.IsSettingsInvoked && NavView.SelectedItem is SquareNavigationViewItem itm) { - if (!args.IsSettingsInvoked && NavView.SelectedItem is SquareNavigationViewItem itm){ - itm.InvokePropertyChanged(); - } + itm.InvokePropertyChanged(); } + } private void MainPage_Loaded(object sender, RoutedEventArgs e) { #if WINDOWS Emerald.Uno.Helpers.WindowManager.SetTitleBar(App.Current.MainWindow, AppTitleBar); #endif -NavView.MenuItems.Add(new SquareNavigationViewItem("Home".Localize()){ - FontIconGlyph = "\xE80F", - SolidFontIconGlyph = "\xEA8A", - IsSelected = true, - ShowFontIcons = true -}); -NavView.MenuItems.Add(new SquareNavigationViewItem("Store".Localize()){ - FontIconGlyph = "\xE7BF", - SolidFontIconGlyph = "\xE7BF", - IsSelected = false, - ShowFontIcons = true -}); -NavView.MenuItems.Add(new SquareNavigationViewItem("News".Localize()){ - FontIconGlyph = "\xF57E", - SolidFontIconGlyph = "\xF57E", - IsSelected = false, - ShowFontIcons = true -}); + NavView.MenuItems.Add(new SquareNavigationViewItem("Home".Localize()) + { + FontIconGlyph = "\xE80F", + Tag = "Home", + SolidFontIconGlyph = "\xEA8A", + IsSelected = true, + ShowFontIcons = true + }); + NavView.MenuItems.Add(new SquareNavigationViewItem("Store".Localize()) + { + Tag = "Store", + FontIconGlyph = "\xE7BF", + SolidFontIconGlyph = "\xE7BF", + IsSelected = false, + ShowFontIcons = true + }); + NavView.MenuItems.Add(new SquareNavigationViewItem("News".Localize()) + { + Tag = "News", + FontIconGlyph = "\xF57E", + SolidFontIconGlyph = "\xF57E", + IsSelected = false, + ShowFontIcons = true + }); + + NavView.FooterMenuItems.Add(new SquareNavigationViewItem("Tasks".Localize()) + { + Tag = "Tasks", + FontIconGlyph = "\xE9D5", + SolidFontIconGlyph = "\xE9D5", + IsSelected = false, + ShowFontIcons = true + }); + NavView.FooterMenuItems.Add(new SquareNavigationViewItem("Logs".Localize()) + { + Tag = "Logs", + FontIconGlyph = "\xE756", + SolidFontIconGlyph = "\xE756", + IsSelected = false, + ShowFontIcons = true + }); + NavView.FooterMenuItems.Add(new SquareNavigationViewItem("Settings".Localize()) + { + Tag = "Settings", + FontIconGlyph = "\xE713", + SolidFontIconGlyph = "\xE713", + IsSelected = false, + ShowFontIcons = true + }); + + NavView.SelectedItem = NavView.MenuItems[0]; + + NavView.Header = new NavViewHeader() { HeaderText = "Home".Localize(), HeaderMargin = GetNavViewHeaderMargin() }; + NavView.DisplayModeChanged += (_, _) => (NavView.Header as NavViewHeader).HeaderMargin = GetNavViewHeaderMargin(); + Navigate(NavView.SelectedItem as SquareNavigationViewItem); + } + + private Thickness GetNavViewHeaderMargin() + { + if (NavView.DisplayMode == NavigationViewDisplayMode.Minimal) + { + NavView.IsPaneToggleButtonVisible = true; + return new Thickness(35, -40, 0, 0); + } + else + { + NavView.IsPaneToggleButtonVisible = false; + return new Thickness(-30, -20, 0, 10); + } + } + private void navView_ItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args) + { + Navigate(NavView.SelectedItem as SquareNavigationViewItem); + } -NavView.FooterMenuItems.Add(new SquareNavigationViewItem("Tasks".Localize()){ - FontIconGlyph = "\xE9D5", - SolidFontIconGlyph = "\xE9D5", - IsSelected = false, - ShowFontIcons = true -}); -NavView.FooterMenuItems.Add(new SquareNavigationViewItem("Logs".Localize()){ - FontIconGlyph = "\xE756", - SolidFontIconGlyph = "\xE756", - IsSelected = false, - ShowFontIcons = true -}); -NavView.FooterMenuItems.Add(new SquareNavigationViewItem("Settings".Localize()){ - FontIconGlyph = "\xE713", - SolidFontIconGlyph = "\xE713", - IsSelected = false, - ShowFontIcons = true -}); + private void Navigate(SquareNavigationViewItem itm) + { + switch (itm.Tag) + { + default: + NavigateOnce(typeof(SettingsPage)); + break; + } + (NavView.Header as NavViewHeader).HeaderText = itm.Tag == "Tasks" ? (NavView.Header as NavViewHeader).HeaderText : itm.Name; + (NavView.Header as NavViewHeader).HeaderMargin = GetNavViewHeaderMargin(); + + } -NavView.SelectedItem = NavView.MenuItems[0]; + private void NavigateOnce(Type type) + { + + if (frame.Content == null || frame.Content.GetType() != type) + { + frame.Navigate(type, null, new EntranceNavigationTransitionInfo()); + } } } diff --git a/Emerald/Models/SquareNavigationViewItem.cs b/Emerald/Models/SquareNavigationViewItem.cs index 2bcbf031..ff520d0f 100644 --- a/Emerald/Models/SquareNavigationViewItem.cs +++ b/Emerald/Models/SquareNavigationViewItem.cs @@ -29,7 +29,7 @@ public SquareNavigationViewItem(string name, bool isSelected = false, ImageSourc } }; } - + public string Tag { get; set; } [ObservableProperty] private string _Name; @@ -57,6 +57,7 @@ public SquareNavigationViewItem(string name, bool isSelected = false, ImageSourc public Visibility FontIconVisibility => ShowFontIcons && !IsSelected ? Visibility.Visible : Visibility.Collapsed; public Visibility SolidFontIconVisibility => ShowFontIcons && IsSelected ? Visibility.Visible : Visibility.Collapsed; - + public Visibility SelectionVisibility => IsSelected ? Visibility.Collapsed : Visibility.Visible; + public bool ShowThumbnail => !ShowFontIcons; } diff --git a/Emerald/Package.appxmanifest b/Emerald/Package.appxmanifest index 29558f1d..76392e52 100644 --- a/Emerald/Package.appxmanifest +++ b/Emerald/Package.appxmanifest @@ -7,13 +7,13 @@ IgnorableNamespaces="uap rescap"> <Identity - Name="Emerald" + Name="Emerald.Uno" Publisher="O=Riverside Valley" Version="1.0.0.0" /> <Properties> - <DisplayName>Emerald</DisplayName> - <PublisherDisplayName>Emerald</PublisherDisplayName> + <DisplayName>Emerald.Uno</DisplayName> + <PublisherDisplayName>Emerald.Uno</PublisherDisplayName> </Properties> <Dependencies> @@ -30,8 +30,8 @@ Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$"> <uap:VisualElements - DisplayName="Emerald" - Description="Emerald"> + DisplayName="Emerald.Uno" + Description="Emerald.Uno"> <uap:SplashScreen /> </uap:VisualElements> </Application> diff --git a/Emerald/Platforms/Desktop/Program.cs b/Emerald/Platforms/Desktop/Program.cs index 505e2c1b..c406e4af 100644 --- a/Emerald/Platforms/Desktop/Program.cs +++ b/Emerald/Platforms/Desktop/Program.cs @@ -1,6 +1,6 @@ using Uno.UI.Runtime.Skia; -namespace Emerald; +namespace Emerald.Uno; public class Program { [STAThread] diff --git a/Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs b/Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs index d26d16e3..08b2a160 100644 --- a/Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs +++ b/Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs @@ -1,6 +1,6 @@ using UIKit; -namespace Emerald.MacCatalyst; +namespace Emerald.Uno.MacCatalyst; public class EntryPoint { // This is the main entry point of the application. diff --git a/Emerald/Properties/launchSettings.json b/Emerald/Properties/launchSettings.json index a8c8aed9..bf880023 100644 --- a/Emerald/Properties/launchSettings.json +++ b/Emerald/Properties/launchSettings.json @@ -9,21 +9,21 @@ }, "profiles": { // Note: In order to select this profile, you'll need to comment the `Packaged` profile below until this is fixed: https://aka.platform.uno/wasdk-maui-debug-profile-issue - "Emerald (WinAppSDK Unpackaged)": { + "Emerald.Uno (WinAppSDK Unpackaged)": { "commandName": "Project", "compatibleTargetFramework": "windows" }, - "Emerald (WinAppSDK Packaged)": { + "Emerald.Uno (WinAppSDK Packaged)": { "commandName": "MsixPackage", "compatibleTargetFramework": "windows" }, - "Emerald (Desktop)": { + "Emerald.Uno (Desktop)": { "commandName": "Project", "compatibleTargetFramework": "desktop" }, - "Emerald (Desktop WSL2)": { + "Emerald.Uno (Desktop WSL2)": { "commandName": "WSL2", - "commandLineArgs": "{ProjectDir}/bin/Debug/net8.0-desktop/Emerald.dll", + "commandLineArgs": "{ProjectDir}/bin/Debug/net8.0-desktop/Emerald.Uno.dll", "distributionName": "", "compatibleTargetFramework": "desktop" } diff --git a/Emerald/Strings/en/Resources.resw b/Emerald/Strings/en/Resources.resw index a311865f..2723b3c3 100644 --- a/Emerald/Strings/en/Resources.resw +++ b/Emerald/Strings/en/Resources.resw @@ -118,6 +118,6 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <data name="ApplicationName" xml:space="preserve"> - <value>Emerald-en</value> + <value>Emerald.Uno-en</value> </data> </root> diff --git a/Emerald/UserControls/Titlebar.xaml b/Emerald/UserControls/Titlebar.xaml index 2ecadaa5..6851a77b 100644 --- a/Emerald/UserControls/Titlebar.xaml +++ b/Emerald/UserControls/Titlebar.xaml @@ -27,7 +27,7 @@ Margin="8,0,0,0" VerticalAlignment="Center" Style="{ThemeResource CaptionTextBlockStyle}" - Text="Emerald" /> + Text="Emerald.Uno" /> <TextBlock x:Name="PreviewTitle" Margin="4,0,0,0" diff --git a/Emerald/Views/Settings/SettingsPage.xaml b/Emerald/Views/Settings/SettingsPage.xaml new file mode 100644 index 00000000..90beefd9 --- /dev/null +++ b/Emerald/Views/Settings/SettingsPage.xaml @@ -0,0 +1,68 @@ +<Page + x:Class="Emerald.Uno.Views.Settings.SettingsPage" + 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" + xmlns:helpers="using:Emerald.Uno.Helpers" + xmlns:local="using:Emerald.Uno.Views.Settings" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:uc="using:Emerald.Uno.UserControls" + mc:Ignorable="d"> + + <Page.Resources> + <ResourceDictionary> + <ResourceDictionary.MergedDictionaries> + <ResourceDictionary> + <SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="Transparent" /> + <Thickness x:Key="NavigationViewContentGridBorderThickness">0</Thickness> + <CornerRadius x:Key="NavigationViewContentGridCornerRadius">0</CornerRadius> + <Thickness x:Key="NavigationViewTopPaneHeight">40</Thickness> + </ResourceDictionary> + </ResourceDictionary.MergedDictionaries> + </ResourceDictionary> + </Page.Resources> + + <Grid> + <Grid.RowDefinitions> + <RowDefinition Height="Auto" /> + <RowDefinition Height="*" /> + </Grid.RowDefinitions> + + <NavigationView + x:Name="navView" + Margin="8,-8,8,0" + Background="Transparent" + IsBackButtonVisible="Collapsed" + IsSettingsVisible="False" + ItemInvoked="navView_ItemInvoked" + PaneDisplayMode="Top"> + + <NavigationView.MenuItems> + <NavigationViewItem + Icon="{helpers:FontIcon Glyph=}" + Content="{helpers:Localize Name=General}" + IsSelected="True" + Tag="General" /> + <NavigationViewItem + Icon="{helpers:FontIcon Glyph=}" + Content="{helpers:Localize Name=Appearance}" + Tag="Appearance" /> + <NavigationViewItem + Icon="{helpers:FontIcon Glyph=}" + Content="{helpers:Localize Name=About}" + Tag="About" /> + </NavigationView.MenuItems> + + </NavigationView> + + <Grid + Grid.Row="1" + Background="{ThemeResource LayerFillColorDefaultBrush}" + BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" + BorderThickness="0,1,0,0"> + <ScrollViewer> + <Frame x:Name="contentframe" /> + </ScrollViewer> + </Grid> + </Grid> +</Page> diff --git a/Emerald/Views/Settings/SettingsPage.xaml.cs b/Emerald/Views/Settings/SettingsPage.xaml.cs new file mode 100644 index 00000000..74339021 --- /dev/null +++ b/Emerald/Views/Settings/SettingsPage.xaml.cs @@ -0,0 +1,45 @@ +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Media.Animation; +using System; + +namespace Emerald.Uno.Views.Settings +{ + public sealed partial class SettingsPage : Page + { + public SettingsPage() + { + InitializeComponent(); + + //Loaded += (_, _) => Navigate(navView.SelectedItem as NavigationViewItem); + } + + private void navView_ItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args) + { + Navigate(navView.SelectedItem as NavigationViewItem); + } + + private void Navigate(NavigationViewItem itm) + { + switch (itm.Tag) + { + case "Appearance": + NavigateOnce(typeof(SettingsPage)); + break; + case "About": + NavigateOnce(typeof(SettingsPage)); + break; + default: + NavigateOnce(typeof(SettingsPage)); + break; + } + } + + private void NavigateOnce(Type type) + { + if (contentframe.Content == null || contentframe.Content.GetType() != type) + { + contentframe.Navigate(type, null, new DrillInNavigationTransitionInfo()); + } + } + } +} diff --git a/Emerald/app.manifest b/Emerald/app.manifest index 7c69768c..a61e665f 100644 --- a/Emerald/app.manifest +++ b/Emerald/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="Emerald.Windows.app"/> + <assemblyIdentity version="1.0.0.0" name="Emerald.Uno.Windows.app"/> <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> <application> From ea843103d6a565ff5bdacdf9a114440f0582e3cd Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Tue, 29 Oct 2024 21:18:08 +0530 Subject: [PATCH 57/61] Undo namespace rename --- Emerald.sln | 2 +- Emerald/App.xaml | 2 +- Emerald/App.xaml.cs | 4 ++-- Emerald/{Emerald.Uno.csproj => Emerald.csproj} | 6 +++--- Emerald/Helpers/Converters/BoolToVisibility.cs | 4 ++-- Emerald/Helpers/Extensions.cs | 2 +- Emerald/Helpers/MarkupExtensions/ConditionString.cs | 2 +- Emerald/Helpers/MarkupExtensions/FontIcon.cs | 2 +- Emerald/Helpers/MarkupExtensions/LocalizeString.cs | 2 +- Emerald/Helpers/Settings/Enums/MicaTintColor.cs | 2 +- Emerald/Helpers/Settings/JSON.cs | 2 +- Emerald/Helpers/Settings/SettingsSystem.cs | 4 ++-- Emerald/Helpers/WindowManager.cs | 2 +- Emerald/MainPage.xaml | 12 ++++++------ Emerald/MainPage.xaml.cs | 10 +++++----- Emerald/Models/Model.cs | 2 +- Emerald/Models/NavViewHeader.cs | 2 +- Emerald/Models/SquareNavigationViewItem.cs | 2 +- Emerald/Package.appxmanifest | 10 +++++----- Emerald/Platforms/Desktop/Program.cs | 2 +- Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs | 2 +- Emerald/Properties/launchSettings.json | 10 +++++----- Emerald/Strings/en/Resources.resw | 2 +- Emerald/UserControls/Titlebar.xaml | 6 +++--- Emerald/UserControls/Titlebar.xaml.cs | 2 +- Emerald/Views/Settings/SettingsPage.xaml | 8 ++++---- Emerald/Views/Settings/SettingsPage.xaml.cs | 2 +- Emerald/app.manifest | 2 +- 28 files changed, 55 insertions(+), 55 deletions(-) rename Emerald/{Emerald.Uno.csproj => Emerald.csproj} (94%) diff --git a/Emerald.sln b/Emerald.sln index cb5195c2..bb5184e0 100644 --- a/Emerald.sln +++ b/Emerald.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.11.35103.136 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emerald.Uno", "Emerald\Emerald.Uno.csproj", "{9D3213F4-E514-4E7D-872A-725DB4872436}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emerald", "Emerald\Emerald.csproj", "{9D3213F4-E514-4E7D-872A-725DB4872436}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3142BDF3-E95C-4F0F-8701-CF981F6EA3C0}" ProjectSection(SolutionItems) = preProject diff --git a/Emerald/App.xaml b/Emerald/App.xaml index f861592b..30649aad 100644 --- a/Emerald/App.xaml +++ b/Emerald/App.xaml @@ -1,4 +1,4 @@ -<Application x:Class="Emerald.Uno.App" +<Application x:Class="Emerald.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> diff --git a/Emerald/App.xaml.cs b/Emerald/App.xaml.cs index ac07a3cd..fddb6cb3 100644 --- a/Emerald/App.xaml.cs +++ b/Emerald/App.xaml.cs @@ -1,6 +1,6 @@ using Uno.Resizetizer; -namespace Emerald.Uno; +namespace Emerald; public partial class App : Application { /// <summary> @@ -50,7 +50,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args) MainWindow.Content = rootFrame; } #if WINDOWS - var mica = Emerald.Uno.Helpers.WindowManager.IntializeWindow(MainWindow); + var mica = Emerald.Helpers.WindowManager.IntializeWindow(MainWindow); #endif if (rootFrame.Content == null) diff --git a/Emerald/Emerald.Uno.csproj b/Emerald/Emerald.csproj similarity index 94% rename from Emerald/Emerald.Uno.csproj rename to Emerald/Emerald.csproj index 9e685211..d6b4ea46 100644 --- a/Emerald/Emerald.Uno.csproj +++ b/Emerald/Emerald.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Uno.Sdk"> +<Project Sdk="Uno.Sdk"> <PropertyGroup> <TargetFrameworks> net8.0-maccatalyst; @@ -10,9 +10,9 @@ <UnoSingleProject>true</UnoSingleProject> <!-- Display name --> - <ApplicationTitle>Emerald.Uno</ApplicationTitle> + <ApplicationTitle>Emerald</ApplicationTitle> <!-- App Identifier --> - <ApplicationId>Riverside.Emerald.Uno</ApplicationId> + <ApplicationId>Riverside.Emerald</ApplicationId> <!-- Versions --> <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion> <ApplicationVersion>1</ApplicationVersion> diff --git a/Emerald/Helpers/Converters/BoolToVisibility.cs b/Emerald/Helpers/Converters/BoolToVisibility.cs index 2fafd1c8..3cd23e81 100644 --- a/Emerald/Helpers/Converters/BoolToVisibility.cs +++ b/Emerald/Helpers/Converters/BoolToVisibility.cs @@ -1,7 +1,7 @@ using Microsoft.UI.Xaml.Data; -namespace Emerald.Uno.Helpers.Converters; +namespace Emerald.Helpers.Converters; public class BoolToVisibility : IValueConverter { public bool Reversed { get; set; } @@ -15,4 +15,4 @@ public object ConvertBack(object value, Type targetType, object parameter, strin { throw new InvalidOperationException(); } - } \ No newline at end of file + } diff --git a/Emerald/Helpers/Extensions.cs b/Emerald/Helpers/Extensions.cs index 34d20225..62482347 100644 --- a/Emerald/Helpers/Extensions.cs +++ b/Emerald/Helpers/Extensions.cs @@ -10,7 +10,7 @@ using System.Text; using Windows.System.Diagnostics; -namespace Emerald.Uno.Helpers; +namespace Emerald.Helpers; public static class Extensions { diff --git a/Emerald/Helpers/MarkupExtensions/ConditionString.cs b/Emerald/Helpers/MarkupExtensions/ConditionString.cs index b73a2c3c..da03abbe 100644 --- a/Emerald/Helpers/MarkupExtensions/ConditionString.cs +++ b/Emerald/Helpers/MarkupExtensions/ConditionString.cs @@ -1,6 +1,6 @@ using Microsoft.UI.Xaml.Markup; -namespace Emerald.Uno.Helpers; +namespace Emerald.Helpers; [MarkupExtensionReturnType(ReturnType = typeof(string))] public class ConditionString : MarkupExtension diff --git a/Emerald/Helpers/MarkupExtensions/FontIcon.cs b/Emerald/Helpers/MarkupExtensions/FontIcon.cs index a7e8c816..5731c5f7 100644 --- a/Emerald/Helpers/MarkupExtensions/FontIcon.cs +++ b/Emerald/Helpers/MarkupExtensions/FontIcon.cs @@ -1,6 +1,6 @@ using Microsoft.UI.Xaml.Markup; -namespace Emerald.Uno.Helpers; +namespace Emerald.Helpers; [MarkupExtensionReturnType(ReturnType = typeof(Microsoft.UI.Xaml.Controls.FontIcon))] public sealed class FontIcon : MarkupExtension diff --git a/Emerald/Helpers/MarkupExtensions/LocalizeString.cs b/Emerald/Helpers/MarkupExtensions/LocalizeString.cs index 31b5689c..495182dc 100644 --- a/Emerald/Helpers/MarkupExtensions/LocalizeString.cs +++ b/Emerald/Helpers/MarkupExtensions/LocalizeString.cs @@ -1,6 +1,6 @@ using Microsoft.UI.Xaml.Markup; using CommunityToolkit.Mvvm; -namespace Emerald.Uno.Helpers; +namespace Emerald.Helpers; [MarkupExtensionReturnType(ReturnType = typeof(string))] public sealed class Localize : MarkupExtension diff --git a/Emerald/Helpers/Settings/Enums/MicaTintColor.cs b/Emerald/Helpers/Settings/Enums/MicaTintColor.cs index 4a97fbb6..3c338142 100644 --- a/Emerald/Helpers/Settings/Enums/MicaTintColor.cs +++ b/Emerald/Helpers/Settings/Enums/MicaTintColor.cs @@ -1,4 +1,4 @@ -namespace Emerald.Uno.Helpers.Settings.Enums +namespace Emerald.Helpers.Settings.Enums { public enum MicaTintColor : int { diff --git a/Emerald/Helpers/Settings/JSON.cs b/Emerald/Helpers/Settings/JSON.cs index 3d1a024a..11b1815a 100644 --- a/Emerald/Helpers/Settings/JSON.cs +++ b/Emerald/Helpers/Settings/JSON.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using Windows.UI; using Emerald.CoreX.Store.Modrinth; -namespace Emerald.Uno.Helpers.Settings.JSON; +namespace Emerald.Helpers.Settings.JSON; public class JSON : Models.Model { diff --git a/Emerald/Helpers/Settings/SettingsSystem.cs b/Emerald/Helpers/Settings/SettingsSystem.cs index 53d3c565..5a25b55a 100644 --- a/Emerald/Helpers/Settings/SettingsSystem.cs +++ b/Emerald/Helpers/Settings/SettingsSystem.cs @@ -1,4 +1,4 @@ -using Emerald.Uno.Helpers.Settings.JSON; +using Emerald.Helpers.Settings.JSON; using System.Text.Json; using System; using System.Collections.Generic; @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Windows.Storage; -namespace Emerald.Uno.Helpers.Settings; +namespace Emerald.Helpers.Settings; public static class SettingsSystem { diff --git a/Emerald/Helpers/WindowManager.cs b/Emerald/Helpers/WindowManager.cs index 5e16c5ca..63761d89 100644 --- a/Emerald/Helpers/WindowManager.cs +++ b/Emerald/Helpers/WindowManager.cs @@ -9,7 +9,7 @@ using WinRT; using WinRT.Interop; -namespace Emerald.Uno.Helpers +namespace Emerald.Helpers { #if WINDOWS public static class WindowManager diff --git a/Emerald/MainPage.xaml b/Emerald/MainPage.xaml index 09b5233f..63a41b90 100644 --- a/Emerald/MainPage.xaml +++ b/Emerald/MainPage.xaml @@ -1,12 +1,12 @@ -<Page x:Class="Emerald.Uno.MainPage" +<Page x:Class="Emerald.MainPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:local="using:Emerald.Uno" + xmlns:local="using:Emerald" xmlns:utu="using:Uno.Toolkit.UI" - xmlns:models="using:Emerald.Uno.Models" - xmlns:uc="using:Emerald.Uno.UserControls" - xmlns:conv="using:Emerald.Uno.Helpers.Converters" - xmlns:helpers="using:Emerald.Uno.Helpers"> + xmlns:models="using:Emerald.Models" + xmlns:uc="using:Emerald.UserControls" + xmlns:conv="using:Emerald.Helpers.Converters" + xmlns:helpers="using:Emerald.Helpers"> <Page.Resources> <conv:BoolToVisibility x:Key="BoolToVisibilty"/> </Page.Resources> diff --git a/Emerald/MainPage.xaml.cs b/Emerald/MainPage.xaml.cs index 5a8a742b..a2496167 100644 --- a/Emerald/MainPage.xaml.cs +++ b/Emerald/MainPage.xaml.cs @@ -1,10 +1,10 @@ -using Emerald.Uno.Helpers; -using Emerald.Uno.Models; -using Emerald.Uno.Views.Settings; +using Emerald.Helpers; +using Emerald.Models; +using Emerald.Views.Settings; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media.Animation; -namespace Emerald.Uno; +namespace Emerald; public sealed partial class MainPage : Page { @@ -24,7 +24,7 @@ private void MainNavigationView_ItemInvoked(NavigationView sender, NavigationVie private void MainPage_Loaded(object sender, RoutedEventArgs e) { #if WINDOWS - Emerald.Uno.Helpers.WindowManager.SetTitleBar(App.Current.MainWindow, AppTitleBar); + Emerald.Helpers.WindowManager.SetTitleBar(App.Current.MainWindow, AppTitleBar); #endif NavView.MenuItems.Add(new SquareNavigationViewItem("Home".Localize()) { diff --git a/Emerald/Models/Model.cs b/Emerald/Models/Model.cs index 1374d30e..552f279d 100644 --- a/Emerald/Models/Model.cs +++ b/Emerald/Models/Model.cs @@ -1,7 +1,7 @@ using CommunityToolkit.Mvvm.ComponentModel; using System.ComponentModel; -namespace Emerald.Uno.Models; +namespace Emerald.Models; public partial class Model : ObservableObject { diff --git a/Emerald/Models/NavViewHeader.cs b/Emerald/Models/NavViewHeader.cs index 97c3ab38..093bdbaa 100644 --- a/Emerald/Models/NavViewHeader.cs +++ b/Emerald/Models/NavViewHeader.cs @@ -1,6 +1,6 @@ using CommunityToolkit.Mvvm.ComponentModel; -namespace Emerald.Uno.Models; +namespace Emerald.Models; public partial class NavViewHeader : Model { diff --git a/Emerald/Models/SquareNavigationViewItem.cs b/Emerald/Models/SquareNavigationViewItem.cs index ff520d0f..3f9f2ac5 100644 --- a/Emerald/Models/SquareNavigationViewItem.cs +++ b/Emerald/Models/SquareNavigationViewItem.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel; -namespace Emerald.Uno.Models; +namespace Emerald.Models; public partial class SquareNavigationViewItem : Model { diff --git a/Emerald/Package.appxmanifest b/Emerald/Package.appxmanifest index 76392e52..29558f1d 100644 --- a/Emerald/Package.appxmanifest +++ b/Emerald/Package.appxmanifest @@ -7,13 +7,13 @@ IgnorableNamespaces="uap rescap"> <Identity - Name="Emerald.Uno" + Name="Emerald" Publisher="O=Riverside Valley" Version="1.0.0.0" /> <Properties> - <DisplayName>Emerald.Uno</DisplayName> - <PublisherDisplayName>Emerald.Uno</PublisherDisplayName> + <DisplayName>Emerald</DisplayName> + <PublisherDisplayName>Emerald</PublisherDisplayName> </Properties> <Dependencies> @@ -30,8 +30,8 @@ Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$"> <uap:VisualElements - DisplayName="Emerald.Uno" - Description="Emerald.Uno"> + DisplayName="Emerald" + Description="Emerald"> <uap:SplashScreen /> </uap:VisualElements> </Application> diff --git a/Emerald/Platforms/Desktop/Program.cs b/Emerald/Platforms/Desktop/Program.cs index c406e4af..505e2c1b 100644 --- a/Emerald/Platforms/Desktop/Program.cs +++ b/Emerald/Platforms/Desktop/Program.cs @@ -1,6 +1,6 @@ using Uno.UI.Runtime.Skia; -namespace Emerald.Uno; +namespace Emerald; public class Program { [STAThread] diff --git a/Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs b/Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs index 08b2a160..d26d16e3 100644 --- a/Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs +++ b/Emerald/Platforms/MacCatalyst/Main.maccatalyst.cs @@ -1,6 +1,6 @@ using UIKit; -namespace Emerald.Uno.MacCatalyst; +namespace Emerald.MacCatalyst; public class EntryPoint { // This is the main entry point of the application. diff --git a/Emerald/Properties/launchSettings.json b/Emerald/Properties/launchSettings.json index bf880023..a8c8aed9 100644 --- a/Emerald/Properties/launchSettings.json +++ b/Emerald/Properties/launchSettings.json @@ -9,21 +9,21 @@ }, "profiles": { // Note: In order to select this profile, you'll need to comment the `Packaged` profile below until this is fixed: https://aka.platform.uno/wasdk-maui-debug-profile-issue - "Emerald.Uno (WinAppSDK Unpackaged)": { + "Emerald (WinAppSDK Unpackaged)": { "commandName": "Project", "compatibleTargetFramework": "windows" }, - "Emerald.Uno (WinAppSDK Packaged)": { + "Emerald (WinAppSDK Packaged)": { "commandName": "MsixPackage", "compatibleTargetFramework": "windows" }, - "Emerald.Uno (Desktop)": { + "Emerald (Desktop)": { "commandName": "Project", "compatibleTargetFramework": "desktop" }, - "Emerald.Uno (Desktop WSL2)": { + "Emerald (Desktop WSL2)": { "commandName": "WSL2", - "commandLineArgs": "{ProjectDir}/bin/Debug/net8.0-desktop/Emerald.Uno.dll", + "commandLineArgs": "{ProjectDir}/bin/Debug/net8.0-desktop/Emerald.dll", "distributionName": "", "compatibleTargetFramework": "desktop" } diff --git a/Emerald/Strings/en/Resources.resw b/Emerald/Strings/en/Resources.resw index 2723b3c3..a311865f 100644 --- a/Emerald/Strings/en/Resources.resw +++ b/Emerald/Strings/en/Resources.resw @@ -118,6 +118,6 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <data name="ApplicationName" xml:space="preserve"> - <value>Emerald.Uno-en</value> + <value>Emerald-en</value> </data> </root> diff --git a/Emerald/UserControls/Titlebar.xaml b/Emerald/UserControls/Titlebar.xaml index 6851a77b..76be090a 100644 --- a/Emerald/UserControls/Titlebar.xaml +++ b/Emerald/UserControls/Titlebar.xaml @@ -1,8 +1,8 @@ <UserControl - x:Class="Emerald.Uno.UserControls.TitleBar" + x:Class="Emerald.UserControls.TitleBar" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:local="using:Emerald.Uno.UserControls" + xmlns:local="using:Emerald.UserControls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" @@ -27,7 +27,7 @@ Margin="8,0,0,0" VerticalAlignment="Center" Style="{ThemeResource CaptionTextBlockStyle}" - Text="Emerald.Uno" /> + Text="Emerald" /> <TextBlock x:Name="PreviewTitle" Margin="4,0,0,0" diff --git a/Emerald/UserControls/Titlebar.xaml.cs b/Emerald/UserControls/Titlebar.xaml.cs index dafb733a..b134aa33 100644 --- a/Emerald/UserControls/Titlebar.xaml.cs +++ b/Emerald/UserControls/Titlebar.xaml.cs @@ -15,7 +15,7 @@ // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236 -namespace Emerald.Uno.UserControls; +namespace Emerald.UserControls; public sealed partial class TitleBar : UserControl { public TitleBar() diff --git a/Emerald/Views/Settings/SettingsPage.xaml b/Emerald/Views/Settings/SettingsPage.xaml index 90beefd9..4587aa96 100644 --- a/Emerald/Views/Settings/SettingsPage.xaml +++ b/Emerald/Views/Settings/SettingsPage.xaml @@ -1,12 +1,12 @@ <Page - x:Class="Emerald.Uno.Views.Settings.SettingsPage" + x:Class="Emerald.Views.Settings.SettingsPage" 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" - xmlns:helpers="using:Emerald.Uno.Helpers" - xmlns:local="using:Emerald.Uno.Views.Settings" + xmlns:helpers="using:Emerald.Helpers" + xmlns:local="using:Emerald.Views.Settings" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:uc="using:Emerald.Uno.UserControls" + xmlns:uc="using:Emerald.UserControls" mc:Ignorable="d"> <Page.Resources> diff --git a/Emerald/Views/Settings/SettingsPage.xaml.cs b/Emerald/Views/Settings/SettingsPage.xaml.cs index 74339021..9e10d21a 100644 --- a/Emerald/Views/Settings/SettingsPage.xaml.cs +++ b/Emerald/Views/Settings/SettingsPage.xaml.cs @@ -2,7 +2,7 @@ using Microsoft.UI.Xaml.Media.Animation; using System; -namespace Emerald.Uno.Views.Settings +namespace Emerald.Views.Settings { public sealed partial class SettingsPage : Page { diff --git a/Emerald/app.manifest b/Emerald/app.manifest index a61e665f..7c69768c 100644 --- a/Emerald/app.manifest +++ b/Emerald/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="Emerald.Uno.Windows.app"/> + <assemblyIdentity version="1.0.0.0" name="Emerald.Windows.app"/> <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> <application> From cc7ca29ad9acda2f6133904a4587794cb6b11008 Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Fri, 29 Nov 2024 13:11:54 +0530 Subject: [PATCH 58/61] update uno version --- Directory.Build.props | 2 +- Directory.Packages.props | 8 +- .../Emerald.App/Helpers/Settings/JSON.cs | 611 +++++++++--------- Emerald.Core/Emerald.Core.csproj | 2 +- Emerald/Emerald.csproj | 8 + global.json | 2 +- 6 files changed, 320 insertions(+), 313 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 69a93b76..47ddeb81 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,7 +16,7 @@ <!-- See https://aka.platform.uno/using-uno-sdk#implicit-packages for more information regarding the Implicit Packages version properties. --> <PropertyGroup> <UnoExtensionsVersion>4.1.24</UnoExtensionsVersion> - <UnoToolkitVersion>6.0.24</UnoToolkitVersion> + <UnoToolkitVersion>6.3.7</UnoToolkitVersion> <UnoThemesVersion>5.0.13</UnoThemesVersion> <UnoCSharpMarkupVersion>5.2.14</UnoCSharpMarkupVersion> </PropertyGroup> diff --git a/Directory.Packages.props b/Directory.Packages.props index e55bb4d6..80bf7862 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,16 +6,16 @@ --> <ItemGroup> <!--Emerald.App--> - <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" /> + <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.3.2" /> <PackageVersion Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" /> <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" /> <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" /> - <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" /> - <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" /> + <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" /> + <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" /> <PackageVersion Include="Octokit" Version="13.0.1" /> <PackageVersion Include="PInvoke.User32" Version="0.7.124" /> <PackageVersion Include="ProjBobcat" Version="1.16.0" /> - <PackageVersion Include="System.Text.Json" Version="8.0.4" /> + <PackageVersion Include="System.Text.Json" Version="8.0.5" /> <PackageVersion Include="WinUIEx" Version="2.3.4" /> <PackageVersion Include="XboxAuthNet.Game.Msal" Version="0.0.5" /> <!--Emerald.CoreX--> diff --git a/Emerald.App/Emerald.App/Helpers/Settings/JSON.cs b/Emerald.App/Emerald.App/Helpers/Settings/JSON.cs index b639a0c1..168a0c28 100644 --- a/Emerald.App/Emerald.App/Helpers/Settings/JSON.cs +++ b/Emerald.App/Emerald.App/Helpers/Settings/JSON.cs @@ -9,417 +9,416 @@ using System; using System.Collections.Generic; using Windows.UI; -namespace Emerald.WinUI.Helpers.Settings.JSON +namespace Emerald.WinUI.Helpers.Settings.JSON; + +public class JSON : Models.Model { - public class JSON : Models.Model - { - public string Serialize() - => JsonSerializer.Serialize(this, new JsonSerializerOptions { WriteIndented = true }); - } + public string Serialize() + => JsonSerializer.Serialize(this, new JsonSerializerOptions { WriteIndented = true }); +} - public class SettingsBackup : JSON - { - public string Backup { get; set; } - public string Name { get; set; } - public DateTime Time { get; set; } - // ik there is Time.ToString() lol - public string DateString => $"{Time.ToLongDateString()} {Time.ToShortTimeString()}"; - } +public class SettingsBackup : JSON +{ + public string Backup { get; set; } + public string Name { get; set; } + public DateTime Time { get; set; } + // ik there is Time.ToString() lol + public string DateString => $"{Time.ToLongDateString()} {Time.ToShortTimeString()}"; +} - public class Backups : JSON - { - public SettingsBackup[] AllBackups { get; set; } = Array.Empty<SettingsBackup>(); - public string APIVersion { get; private set; } = "1.0"; - } +public class Backups : JSON +{ + public SettingsBackup[] AllBackups { get; set; } = Array.Empty<SettingsBackup>(); + public string APIVersion { get; private set; } = "1.0"; +} - public class Settings : JSON +public class Settings : JSON +{ + public static Settings CreateNew() => new() { - public static Settings CreateNew() => new() + App = new() { - App = new() + Discord = new(), + Appearance = new() { - Discord = new(), - Appearance = new() - { - MicaTintColor = (int)Enums.MicaTintColor.NoColor, - Theme = (int)ElementTheme.Default - } - }, - Minecraft = new() + MicaTintColor = (int)Enums.MicaTintColor.NoColor, + Theme = (int)ElementTheme.Default + } + }, + Minecraft = new() + { + Path = MinecraftPath.GetOSDefaultPath(), + RAM = DirectResoucres.MaxRAM / 2, + MCVerionsConfiguration = new(), + JVM = new(), + Downloader = new() { - Path = MinecraftPath.GetOSDefaultPath(), - RAM = DirectResoucres.MaxRAM / 2, - MCVerionsConfiguration = new(), - JVM = new(), - Downloader = new() - { - AssetsCheck = true, - HashCheck = true - } + AssetsCheck = true, + HashCheck = true } - }; + } + }; - public string APIVersion { get; set; } = DirectResoucres.SettingsAPIVersion; - public DateTime LastSaved { get; set; } = DateTime.Now; - public Minecraft Minecraft { get; set; } = new(); + public string APIVersion { get; set; } = DirectResoucres.SettingsAPIVersion; + public DateTime LastSaved { get; set; } = DateTime.Now; + public Minecraft Minecraft { get; set; } = new(); - public App App { get; set; } = new(); - } + public App App { get; set; } = new(); +} - public partial class Minecraft : JSON +public partial class Minecraft : JSON +{ + public Minecraft() { - public Minecraft() + JVM.PropertyChanged += (_, _) + => InvokePropertyChanged(); + PropertyChanged += (_, e) => { - JVM.PropertyChanged += (_, _) - => InvokePropertyChanged(); - PropertyChanged += (_, e) => - { - if (e.PropertyName != null) - InvokePropertyChanged(); - }; - } + if (e.PropertyName != null) + InvokePropertyChanged(); + }; + } - [JsonIgnore] - public double RAMinGB => Math.Round((RAM / 1024.00), 2); + [JsonIgnore] + public double RAMinGB => Math.Round((RAM / 1024.00), 2); - [ObservableProperty] - private string _Path; + [ObservableProperty] + private string _Path; - [ObservableProperty] - private int _RAM; + [ObservableProperty] + private int _RAM; - [ObservableProperty] - private bool _IsAdmin; + [ObservableProperty] + private bool _IsAdmin; - public Downloader Downloader { get; set; } = new(); + public Downloader Downloader { get; set; } = new(); - public MCVerionsConfiguration MCVerionsConfiguration { get; set; } + public MCVerionsConfiguration MCVerionsConfiguration { get; set; } - public JVM JVM { get; set; } = new(); + public JVM JVM { get; set; } = new(); - public bool ReadLogs() - => JVM.GameLogs && !IsAdmin; - } + public bool ReadLogs() + => JVM.GameLogs && !IsAdmin; +} - public class Account : JSON - { - public string Type { get; set; } - public string Username { get; set; } - public string AccessToken { get; set; } - public string ClientToken { get; set; } - public string UUID { get; set; } - public bool LastAccessed { get; set; } - } +public class Account : JSON +{ + public string Type { get; set; } + public string Username { get; set; } + public string AccessToken { get; set; } + public string ClientToken { get; set; } + public string UUID { get; set; } + public bool LastAccessed { get; set; } +} - public partial class Downloader : JSON - { - [ObservableProperty] - private bool _HashCheck; +public partial class Downloader : JSON +{ + [ObservableProperty] + private bool _HashCheck; - [ObservableProperty] - private bool _AssetsCheck; - } + [ObservableProperty] + private bool _AssetsCheck; +} - public partial class JVM : JSON +public partial class JVM : JSON +{ + public JVM() { - public JVM() + this.PropertyChanged += (_, e) => { - this.PropertyChanged += (_, e) => - { - if (e.PropertyName != null) - this.InvokePropertyChanged(); - }; - } + if (e.PropertyName != null) + this.InvokePropertyChanged(); + }; + } - [ObservableProperty] - private string[] _Arguments; + [ObservableProperty] + private string[] _Arguments; - [ObservableProperty] - private double _ScreenWidth; + [ObservableProperty] + private double _ScreenWidth; - [ObservableProperty] - private double _ScreenHeight; + [ObservableProperty] + private double _ScreenHeight; - [ObservableProperty] - private bool _FullScreen; + [ObservableProperty] + private bool _FullScreen; - [ObservableProperty] - private bool _GameLogs; + [ObservableProperty] + private bool _GameLogs; - [JsonIgnore] - public string ScreenSizeStatus => - FullScreen ? "FullScreen".Localize() : ((ScreenWidth > 0 && ScreenHeight > 0) ? $"{ScreenWidth} × {ScreenHeight}" : "Default".Localize()); + [JsonIgnore] + public string ScreenSizeStatus => + FullScreen ? "FullScreen".Localize() : ((ScreenWidth > 0 && ScreenHeight > 0) ? $"{ScreenWidth} × {ScreenHeight}" : "Default".Localize()); - [JsonIgnore] - public bool SetSize => !(ScreenSizeStatus == "FullScreen".Localize() || ScreenSizeStatus == "Default".Localize()); - } + [JsonIgnore] + public bool SetSize => !(ScreenSizeStatus == "FullScreen".Localize() || ScreenSizeStatus == "Default".Localize()); +} - public class App : JSON - { - public Appearance Appearance { get; set; } = new(); - public bool AutoLogin { get; set; } - public Discord Discord { get; set; } = new(); - public NewsFilter NewsFilter { get; set; } = new(); - public Store Store { get; set; } = new(); - public Updates Updates { get; set; } = new(); - public bool AutoClose { get; set; } - public bool HideOnLaunch { get; set; } - public bool WindowsHello { get; set; } - } - public class Updates : JSON - { - public bool CheckAtStartup { get; set; } = true; - public bool AutoDownload { get; set; } - public bool IncludePreReleases { get; set; } - } - public partial class StoreFilter : JSON - { - [ObservableProperty] - private bool _Fabric; +public class App : JSON +{ + public Appearance Appearance { get; set; } = new(); + public bool AutoLogin { get; set; } + public Discord Discord { get; set; } = new(); + public NewsFilter NewsFilter { get; set; } = new(); + public Store Store { get; set; } = new(); + public Updates Updates { get; set; } = new(); + public bool AutoClose { get; set; } + public bool HideOnLaunch { get; set; } + public bool WindowsHello { get; set; } +} +public class Updates : JSON +{ + public bool CheckAtStartup { get; set; } = true; + public bool AutoDownload { get; set; } + public bool IncludePreReleases { get; set; } +} +public partial class StoreFilter : JSON +{ + [ObservableProperty] + private bool _Fabric; - [ObservableProperty] - private bool _Forge; + [ObservableProperty] + private bool _Forge; - [ObservableProperty] - private bool _Adventure; + [ObservableProperty] + private bool _Adventure; - [ObservableProperty] - private bool _Cursed; + [ObservableProperty] + private bool _Cursed; - [ObservableProperty] - private bool _Decoration; + [ObservableProperty] + private bool _Decoration; - [ObservableProperty] - private bool _Equipment; + [ObservableProperty] + private bool _Equipment; - [ObservableProperty] - private bool _Food; + [ObservableProperty] + private bool _Food; - [ObservableProperty] - private bool _Library; + [ObservableProperty] + private bool _Library; - [ObservableProperty] - private bool _Magic; + [ObservableProperty] + private bool _Magic; - [ObservableProperty] - private bool _Misc; + [ObservableProperty] + private bool _Misc; - [ObservableProperty] - private bool _Optimization; + [ObservableProperty] + private bool _Optimization; - [ObservableProperty] - private bool _Storage; + [ObservableProperty] + private bool _Storage; - [ObservableProperty] - private bool _Technology; + [ObservableProperty] + private bool _Technology; - [ObservableProperty] - private bool _Utility; + [ObservableProperty] + private bool _Utility; - [ObservableProperty] - private bool _Worldgen; + [ObservableProperty] + private bool _Worldgen; - [JsonIgnore] - public bool All + [JsonIgnore] + public bool All + { + get => GetResult().Length == 0; + set { - get => GetResult().Length == 0; - set - { - _Fabric = _Forge = _Adventure = _Cursed = _Decoration = _Equipment = _Food = _Library = _Magic = _Misc = _Optimization = _Storage = _Technology = _Utility = _Worldgen = false; - InvokePropertyChanged(null); - } + Fabric = Forge = Adventure = Cursed = Decoration = Equipment = Food = Library = Magic = Misc = Optimization = Storage = Technology = Utility = Worldgen = false; + InvokePropertyChanged(null); } - public SearchCategories[] GetResult() - { - if (Fabric & Forge & Adventure & Cursed & Decoration & Equipment & Food & Library & Magic & Misc & Optimization & Storage & Technology & Utility & Worldgen) - return Array.Empty<SearchCategories>(); + } + public SearchCategories[] GetResult() + { + if (Fabric & Forge & Adventure & Cursed & Decoration & Equipment & Food & Library & Magic & Misc & Optimization & Storage & Technology & Utility & Worldgen) + return Array.Empty<SearchCategories>(); - var r = new List<SearchCategories>(); + var r = new List<SearchCategories>(); - if (Fabric) - r.Add(SearchCategories.Fabric); + if (Fabric) + r.Add(SearchCategories.Fabric); - if (Forge) - r.Add(SearchCategories.Forge); + if (Forge) + r.Add(SearchCategories.Forge); - if (Adventure) - r.Add(SearchCategories.Adventure); + if (Adventure) + r.Add(SearchCategories.Adventure); - if (Cursed) - r.Add(SearchCategories.Cursed); + if (Cursed) + r.Add(SearchCategories.Cursed); - if (Decoration) - r.Add(SearchCategories.Decoration); + if (Decoration) + r.Add(SearchCategories.Decoration); - if (Equipment) - r.Add(SearchCategories.Equipment); + if (Equipment) + r.Add(SearchCategories.Equipment); - if (Food) - r.Add(SearchCategories.Food); + if (Food) + r.Add(SearchCategories.Food); - if (Library) - r.Add(SearchCategories.Library); + if (Library) + r.Add(SearchCategories.Library); - if (Magic) - r.Add(SearchCategories.Magic); + if (Magic) + r.Add(SearchCategories.Magic); - if (Misc) - r.Add(SearchCategories.Misc); + if (Misc) + r.Add(SearchCategories.Misc); - if (Optimization) - r.Add(SearchCategories.Optimization); + if (Optimization) + r.Add(SearchCategories.Optimization); - if (Storage) - r.Add(SearchCategories.Storage); + if (Storage) + r.Add(SearchCategories.Storage); - if (Technology) - r.Add(SearchCategories.Technology); + if (Technology) + r.Add(SearchCategories.Technology); - if (Utility) - r.Add(SearchCategories.Utility); + if (Utility) + r.Add(SearchCategories.Utility); - if (Worldgen) - r.Add(SearchCategories.Worldgen); + if (Worldgen) + r.Add(SearchCategories.Worldgen); - return r.ToArray(); - } - } - public class Store : JSON - { - public StoreFilter Filter { get; set; } = new(); - public StoreSortOptions SortOptions { get; set; } = new(); + return r.ToArray(); } +} +public class Store : JSON +{ + public StoreFilter Filter { get; set; } = new(); + public StoreSortOptions SortOptions { get; set; } = new(); +} - public partial class StoreSortOptions : JSON - { - [ObservableProperty] - private bool _Relevance = true; +public partial class StoreSortOptions : JSON +{ + [ObservableProperty] + private bool _Relevance = true; - [ObservableProperty] - private bool _Downloads; + [ObservableProperty] + private bool _Downloads; - [ObservableProperty] - private bool _Follows; + [ObservableProperty] + private bool _Follows; - [ObservableProperty] - private bool _Updated; + [ObservableProperty] + private bool _Updated; - [ObservableProperty] - private bool _Newest; + [ObservableProperty] + private bool _Newest; - public SearchSortOptions GetResult() - { - if (!(Relevance || Downloads || Follows || Updated || Newest)) - return SearchSortOptions.Relevance; - else - return Relevance ? SearchSortOptions.Relevance : (Downloads ? SearchSortOptions.Downloads : (Follows ? SearchSortOptions.Follows : (Updated ? SearchSortOptions.Updated : SearchSortOptions.Newest))); - } - } - public partial class NewsFilter : JSON + public SearchSortOptions GetResult() { - [ObservableProperty] - private bool _Java = false; + if (!(Relevance || Downloads || Follows || Updated || Newest)) + return SearchSortOptions.Relevance; + else + return Relevance ? SearchSortOptions.Relevance : (Downloads ? SearchSortOptions.Downloads : (Follows ? SearchSortOptions.Follows : (Updated ? SearchSortOptions.Updated : SearchSortOptions.Newest))); + } +} +public partial class NewsFilter : JSON +{ + [ObservableProperty] + private bool _Java = false; - [ObservableProperty] - private bool _Bedrock = false; + [ObservableProperty] + private bool _Bedrock = false; - [ObservableProperty] - private bool _Dungeons = false; + [ObservableProperty] + private bool _Dungeons = false; - [ObservableProperty] - private bool _Legends = false; + [ObservableProperty] + private bool _Legends = false; - [JsonIgnore] - public bool All + [JsonIgnore] + public bool All + { + get => GetResult().Length == 4; + set { - get => GetResult().Length == 4; - set - { - Java = Bedrock = Dungeons = Legends = false; - InvokePropertyChanged(null); - } + Java = Bedrock = Dungeons = Legends = false; + InvokePropertyChanged(null); } - public string[] GetResult() - { - var r = new List<string>(); + } + public string[] GetResult() + { + var r = new List<string>(); - if (!Java && !Bedrock && !Dungeons && !Legends) - { - r.Add("Minecraft: Java Edition"); - r.Add("Minecraft for Windows"); - r.Add("Minecraft Dungeons"); - r.Add("Minecraft Legends"); - return r.ToArray(); - } + if (!Java && !Bedrock && !Dungeons && !Legends) + { + r.Add("Minecraft: Java Edition"); + r.Add("Minecraft for Windows"); + r.Add("Minecraft Dungeons"); + r.Add("Minecraft Legends"); + return r.ToArray(); + } - if (Java) - r.Add("Minecraft: Java Edition"); + if (Java) + r.Add("Minecraft: Java Edition"); - if (Bedrock) - r.Add("Minecraft for Windows"); + if (Bedrock) + r.Add("Minecraft for Windows"); - if (Dungeons) - r.Add("Minecraft Dungeons"); + if (Dungeons) + r.Add("Minecraft Dungeons"); - if (Legends) - r.Add("Minecraft Legends"); + if (Legends) + r.Add("Minecraft Legends"); - return r.ToArray(); - } + return r.ToArray(); } - public class Discord : JSON - { - } - public partial class MCVerionsConfiguration : JSON - { - [ObservableProperty] - private bool _Release = true; +} +public class Discord : JSON +{ +} +public partial class MCVerionsConfiguration : JSON +{ + [ObservableProperty] + private bool _Release = true; - [ObservableProperty] - private bool _Custom = false; + [ObservableProperty] + private bool _Custom = false; - [ObservableProperty] - private bool _OldBeta = false; + [ObservableProperty] + private bool _OldBeta = false; - [ObservableProperty] - private bool _OldAlpha = false; + [ObservableProperty] + private bool _OldAlpha = false; - [ObservableProperty] - private bool _Snapshot = false; - } + [ObservableProperty] + private bool _Snapshot = false; +} - public partial class Appearance : JSON - { - [ObservableProperty] - private int _NavIconType = 1; +public partial class Appearance : JSON +{ + [ObservableProperty] + private int _NavIconType = 1; - public bool ShowFontIcons => NavIconType == 0; + public bool ShowFontIcons => NavIconType == 0; - [ObservableProperty] - private int _Theme; + [ObservableProperty] + private int _Theme; - [ObservableProperty] - private int _MicaTintColor; + [ObservableProperty] + private int _MicaTintColor; - [ObservableProperty] - private int _MicaType = 0; + [ObservableProperty] + private int _MicaType = 0; - [ObservableProperty] - private (int A, int R, int G, int B)? _CustomMicaTintColor; + [ObservableProperty] + private (int A, int R, int G, int B)? _CustomMicaTintColor; - //I had to do this because whenever the app has no Mica it won't change the background color when requested theme changes unless the Windows main theme gets changed. - [JsonIgnore] - public Color Win10BackgroundColor => (SystemInformation.Instance.OperatingSystemVersion.Build < 22000) ? (Emerald.WinUI.App.Current.ActualTheme == ElementTheme.Light ? Colors.White : Colors.Black) : Colors.Transparent; + //I had to do this because whenever the app has no Mica it won't change the background color when requested theme changes unless the Windows main theme gets changed. + [JsonIgnore] + public Color Win10BackgroundColor => (SystemInformation.Instance.OperatingSystemVersion.Build < 22000) ? (Emerald.WinUI.App.Current.ActualTheme == ElementTheme.Light ? Colors.White : Colors.Black) : Colors.Transparent; - public Appearance() + public Appearance() + { + this.PropertyChanged += (_, e) => { - this.PropertyChanged += (_, e) => - { - if (e.PropertyName != null) - this.InvokePropertyChanged(); - }; - } + if (e.PropertyName != null) + this.InvokePropertyChanged(); + }; } } diff --git a/Emerald.Core/Emerald.Core.csproj b/Emerald.Core/Emerald.Core.csproj index 5417152c..80509451 100644 --- a/Emerald.Core/Emerald.Core.csproj +++ b/Emerald.Core/Emerald.Core.csproj @@ -12,7 +12,7 @@ <PackageReference Include="CmlLib.Core" Version="3.3.10" /> <PackageReference Include="CmlLib.Core.Auth.Microsoft" Version="3.0.1" /> <PackageReference Include="ProjBobcat" Version="1.16.0" /> - <PackageReference Include="System.Text.Json" Version="8.0.4" /> + <PackageReference Include="System.Text.Json" Version="8.0.5" /> </ItemGroup> </Project> \ No newline at end of file diff --git a/Emerald/Emerald.csproj b/Emerald/Emerald.csproj index d6b4ea46..6339dada 100644 --- a/Emerald/Emerald.csproj +++ b/Emerald/Emerald.csproj @@ -28,6 +28,11 @@ --> <!-- <WindowsSdkPackageVersion>10.0.22621.28</WindowsSdkPackageVersion> --> + <!-- + I had to add this unless it throws an error, with duplicate Webview files. + <ErrorOnDuplicatePublishOutputFiles>true</ErrorOnDuplicatePublishOutputFiles> + + --> <!-- UnoFeatures let's you quickly add and manage implicit package references based on the features you want to use. https://aka.platform.uno/singleproject-features @@ -37,9 +42,11 @@ Hosting; Toolkit; Mvvm; + Localization; ThemeService; </UnoFeatures> </PropertyGroup> + <ItemGroup> <None Remove="Assets\icon.png" /> <None Remove="UserControls\Titlebar.xaml" /> @@ -60,6 +67,7 @@ <Generator>MSBuild:Compile</Generator> </Page> </ItemGroup> + <ItemGroup> <Page Update="Views\Settings\SettingsPage.xaml"> <Generator>MSBuild:Compile</Generator> diff --git a/global.json b/global.json index ce7228cb..d0de00bf 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information. "msbuild-sdks": { - "Uno.Sdk": "5.2.175" + "Uno.Sdk": "5.5.49" }, "sdk": { "allowPrerelease": false From bf9af29a919e5f53bc4870977bd66ed707cde737 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sat, 30 Nov 2024 15:37:33 +0000 Subject: [PATCH 59/61] Fix typo in README.md Signed-off-by: Lamparter <71598437+Lamparter@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5beef04d..861c3709 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ There are multiple ways to participate in the community: ├──Emerald.App // Emerald app code and packager | ├──Emerald.App // Emerald app code (such as code related to UI but not Minecraft) | └──Emerald.App.Package // Package code for generating an uploadable MSIX bundle. -├──Emerald.Core // Emerald core code (such as code related to launching and modifying Minecraft +├──Emerald.Core // Emerald core code (such as code related to launching and modifying Minecraft) └──Emerald.CoreX // Emerald core code for the ability to run different Minecraft installation profiles and mods. ``` From 40ea45a19892a8d6ed0a25fe25d5d676f76c7b6e Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Sat, 30 Nov 2024 21:08:52 +0530 Subject: [PATCH 60/61] add general settings page + minor changes --- Directory.Packages.props | 4 +- .../Views/Settings/GeneralPage.xaml | 154 +++++------ Emerald/App.xaml.cs | 2 +- Emerald/DirectResources.cs | 39 +++ Emerald/Emerald.csproj | 24 +- .../Helpers/Settings/Enums/MicaTintColor.cs | 13 +- Emerald/Helpers/WindowManager.cs | 251 +++++++++--------- Emerald/Models/ArgTemplate.cs | 13 + Emerald/UserControls/ArgumentsListView.xaml | 62 +++++ .../UserControls/ArgumentsListView.xaml.cs | 92 +++++++ Emerald/Views/Settings/GeneralPage.xaml | 149 +++++++++++ Emerald/Views/Settings/GeneralPage.xaml.cs | 84 ++++++ Emerald/Views/Settings/SettingsPage.xaml | 2 +- Emerald/Views/Settings/SettingsPage.xaml.cs | 57 ++-- 14 files changed, 700 insertions(+), 246 deletions(-) create mode 100644 Emerald/DirectResources.cs create mode 100644 Emerald/Models/ArgTemplate.cs create mode 100644 Emerald/UserControls/ArgumentsListView.xaml create mode 100644 Emerald/UserControls/ArgumentsListView.xaml.cs create mode 100644 Emerald/Views/Settings/GeneralPage.xaml create mode 100644 Emerald/Views/Settings/GeneralPage.xaml.cs diff --git a/Directory.Packages.props b/Directory.Packages.props index 80bf7862..086d7816 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,11 +7,13 @@ <ItemGroup> <!--Emerald.App--> <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.3.2" /> + <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240916" /> + <PackageVersion Include="CommunityToolkit.WinUI.Helpers" Version="8.1.240916" /> <PackageVersion Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" /> <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" /> <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" /> <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" /> - <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" /> + <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.57" /> <PackageVersion Include="Octokit" Version="13.0.1" /> <PackageVersion Include="PInvoke.User32" Version="0.7.124" /> <PackageVersion Include="ProjBobcat" Version="1.16.0" /> diff --git a/Emerald.App/Emerald.App/Views/Settings/GeneralPage.xaml b/Emerald.App/Emerald.App/Views/Settings/GeneralPage.xaml index f55b5ec7..29886196 100644 --- a/Emerald.App/Emerald.App/Views/Settings/GeneralPage.xaml +++ b/Emerald.App/Emerald.App/Views/Settings/GeneralPage.xaml @@ -13,59 +13,59 @@ xmlns:uc="using:Emerald.WinUI.UserControls" mc:Ignorable="d"> - <Grid Margin="16"> - <Grid.Resources> - <ResourceDictionary Source="/ResourceDictionaries/Expanders.xaml" /> - </Grid.Resources> + <Grid Margin="16"> + <Grid.Resources> + <ResourceDictionary Source="/ResourceDictionaries/Expanders.xaml" /> + </Grid.Resources> - <StackPanel Spacing="16"> - <StackPanel Spacing="4"> - <TextBlock FontWeight="SemiBold" Text="{helpers:Localize Name=GeneralSettings}" /> - <uc:Expander + <StackPanel Spacing="16"> + <StackPanel Spacing="4"> + <TextBlock FontWeight="SemiBold" Text="{helpers:Localize Name=GeneralSettings}" /> + <uc:Expander Title="{helpers:Localize Name=MinecraftPath}" Description="{helpers:Localize Name=MinecraftPathDescription}" ExpanderStyle="Static" Icon=""> - <HyperlinkButton + <HyperlinkButton ToolTipService.ToolTip="{x:Bind SS:SettingsSystem.Settings.Minecraft.Path, Mode=OneWay}" Click="btnChangeMPath_Click"> - <TextBlock + <TextBlock MaxWidth="250" VerticalAlignment="Center" Text="{x:Bind SS:SettingsSystem.Settings.Minecraft.Path, Mode=OneWay}" TextTrimming="CharacterEllipsis" /> - </HyperlinkButton> - </uc:Expander> + </HyperlinkButton> + </uc:Expander> - <uc:Expander + <uc:Expander Title="{helpers:Localize Name=RAM}" Description="{helpers:Localize Name=RAMDescription}" Icon="" IsEnabled="{x:Bind Main:App.Current.Launcher.UIState, Mode=OneWay}"> - <uc:Expander.HeaderControls> - <StackPanel Orientation="Horizontal" Spacing="5"> - <TextBlock x:Name="txtRam" VerticalAlignment="Center"> + <uc:Expander.HeaderControls> + <StackPanel Orientation="Horizontal" Spacing="5"> + <TextBlock x:Name="txtRam" VerticalAlignment="Center"> <Run Text="{x:Bind SS:SettingsSystem.Settings.Minecraft.RAMinGB, Mode=OneWay}" /> GB</TextBlock> - <RepeatButton + <RepeatButton Padding="5" Click="btnRamPlus_Click" Content="{helpers:FontIcon Glyph=}" FontWeight="SemiBold" /> - <RepeatButton + <RepeatButton Padding="5" Click="btnRamMinus_Click" Content="{helpers:FontIcon Glyph=}" FontWeight="SemiBold" /> - </StackPanel> - </uc:Expander.HeaderControls> - <uc:Expander.Controls> - <Grid> - <Grid.ColumnDefinitions> - <ColumnDefinition Width="*" /> - <ColumnDefinition Width="auto" /> - </Grid.ColumnDefinitions> - <Slider + </StackPanel> + </uc:Expander.HeaderControls> + <uc:Expander.Controls> + <Grid> + <Grid.ColumnDefinitions> + <ColumnDefinition Width="*" /> + <ColumnDefinition Width="auto" /> + </Grid.ColumnDefinitions> + <Slider Grid.Column="0" Maximum="{x:Bind Main:DirectResoucres.MaxRAM}" Minimum="{x:Bind Main:DirectResoucres.MinRAM}" @@ -73,78 +73,78 @@ SmallChange="1" LargeChange="64" Value="{x:Bind SS:SettingsSystem.Settings.Minecraft.RAM, Mode=TwoWay}" /> - </Grid> - </uc:Expander.Controls> - </uc:Expander> + </Grid> + </uc:Expander.Controls> + </uc:Expander> - <uc:Expander + <uc:Expander Title="{helpers:Localize Name=DownloadSettings}" Description="{helpers:Localize Name=DownloadSettingsDescription}" Icon="" IsEnabled="{x:Bind Main:App.Current.Launcher.UIState, Mode=OneWay}"> - <StackPanel Spacing="6"> - <uc:ExpanderItem + <StackPanel Spacing="6"> + <uc:ExpanderItem Title="{helpers:Localize Name=AssetsCheck}" Margin="0,-10,0,0" BorderVisibility="Collapsed"> - <ToggleSwitch IsOn="{x:Bind SS:SettingsSystem.Settings.Minecraft.Downloader.AssetsCheck, Mode=TwoWay}" /> - </uc:ExpanderItem> - <uc:ExpanderItem Title="{helpers:Localize Name=HashCheck}" Margin="0,0,0,-10"> - <ToggleSwitch IsOn="{x:Bind SS:SettingsSystem.Settings.Minecraft.Downloader.HashCheck, Mode=TwoWay}" /> - </uc:ExpanderItem> - </StackPanel> - </uc:Expander> - <uc:Expander + <ToggleSwitch IsOn="{x:Bind SS:SettingsSystem.Settings.Minecraft.Downloader.AssetsCheck, Mode=TwoWay}" /> + </uc:ExpanderItem> + <uc:ExpanderItem Title="{helpers:Localize Name=HashCheck}" Margin="0,0,0,-10"> + <ToggleSwitch IsOn="{x:Bind SS:SettingsSystem.Settings.Minecraft.Downloader.HashCheck, Mode=TwoWay}" /> + </uc:ExpanderItem> + </StackPanel> + </uc:Expander> + <uc:Expander Title="{helpers:Localize Name=AutoLogin}" Description="{helpers:Localize Name=AutoLoginDescription}" ExpanderStyle="Static" Icon="" IsEnabled="{x:Bind Main:App.Current.Launcher.UIState, Mode=OneWay}"> - <ToggleSwitch + <ToggleSwitch IsOn="{x:Bind SS:SettingsSystem.Settings.App.AutoLogin, Mode=TwoWay}" OffContent="{helpers:Localize Name=No}" OnContent="{helpers:Localize Name=Yes}" /> - </uc:Expander> - </StackPanel> + </uc:Expander> + </StackPanel> - <StackPanel Spacing="4"> - <TextBlock FontWeight="SemiBold" Text="{helpers:Localize Name=AdvancedMinecraftSettings}" /> + <StackPanel Spacing="4"> + <TextBlock FontWeight="SemiBold" Text="{helpers:Localize Name=AdvancedMinecraftSettings}" /> - <uc:Expander + <uc:Expander Title="{helpers:Localize Name=MCasAdmin}" Description="{helpers:Localize Name=MCasAdminDescription}" ExpanderStyle="Static" Icon="" IsEnabled="{x:Bind Main:App.Current.Launcher.UIState, Mode=OneWay}"> - <ToggleSwitch + <ToggleSwitch IsOn="{x:Bind SS:SettingsSystem.Settings.Minecraft.IsAdmin, Mode=TwoWay}" OffContent="{helpers:Localize Name=No}" OnContent="{helpers:Localize Name=Yes}" /> - </uc:Expander> - - <uc:Expander + </uc:Expander> + + <uc:Expander Title="{helpers:Localize Name=MCWindowsSize}" Description="{helpers:Localize Name=MCWindowsSizeDescription}" Icon=""> - <uc:Expander.HeaderControls> - <TextBlock Text="{x:Bind SS:SettingsSystem.Settings.Minecraft.JVM.ScreenSizeStatus, Mode=OneWay}"/> - </uc:Expander.HeaderControls> - <StackPanel Spacing="5"> - <uc:ExpanderItem + <uc:Expander.HeaderControls> + <TextBlock Text="{x:Bind SS:SettingsSystem.Settings.Minecraft.JVM.ScreenSizeStatus, Mode=OneWay}"/> + </uc:Expander.HeaderControls> + <StackPanel Spacing="5"> + <uc:ExpanderItem Title="{helpers:Localize Name=Width}" Margin="0,-10,0,0" BorderVisibility="Collapsed"> - <NumberBox + <NumberBox Minimum="0" Value="{x:Bind SS:SettingsSystem.Settings.Minecraft.JVM.ScreenWidth, Mode=TwoWay}" SpinButtonPlacementMode="Inline" LargeChange="80" SmallChange="10" PlaceholderText="{helpers:Localize Name=Default}"/> - </uc:ExpanderItem> - <uc:ExpanderItem + </uc:ExpanderItem> + <uc:ExpanderItem Title="{helpers:Localize Name=Height}"> - <NumberBox + <NumberBox Margin="0,4,0,0" Minimum="0" Value="{x:Bind SS:SettingsSystem.Settings.Minecraft.JVM.ScreenHeight, Mode=TwoWay}" @@ -152,33 +152,33 @@ LargeChange="80" SmallChange="10" PlaceholderText="{helpers:Localize Name=Default}"/> - </uc:ExpanderItem> - <uc:ExpanderItem Title="{helpers:Localize Name=FullScreen}" Margin="0,0,0,-10"> - <ToggleSwitch IsOn="{x:Bind SS:SettingsSystem.Settings.Minecraft.JVM.FullScreen, Mode=TwoWay}" /> - </uc:ExpanderItem> - </StackPanel> - </uc:Expander> - - <uc:Expander + </uc:ExpanderItem> + <uc:ExpanderItem Title="{helpers:Localize Name=FullScreen}" Margin="0,0,0,-10"> + <ToggleSwitch IsOn="{x:Bind SS:SettingsSystem.Settings.Minecraft.JVM.FullScreen, Mode=TwoWay}" /> + </uc:ExpanderItem> + </StackPanel> + </uc:Expander> + + <uc:Expander Title="{helpers:Localize Name=JVMArgs}" Description="{helpers:Localize Name=JVMArgsDescription}" Icon="" IsEnabled="{x:Bind Main:App.Current.Launcher.UIState, Mode=OneWay}"> - <uc:ArgumentsListView /> - </uc:Expander> + <uc:ArgumentsListView /> + </uc:Expander> - <uc:Expander + <uc:Expander Title="{helpers:Localize Name=GameLogs}" Description="{helpers:Localize Name=GameLogsDescription}" ExpanderStyle="Static" Icon="" IsEnabled="{x:Bind Main:App.Current.Launcher.UIState, Mode=OneWay}"> - <ToggleSwitch + <ToggleSwitch IsOn="{x:Bind SS:SettingsSystem.Settings.Minecraft.JVM.GameLogs, Mode=TwoWay}" OffContent="{helpers:Localize Name=No}" OnContent="{helpers:Localize Name=Yes}" /> - </uc:Expander> - </StackPanel> - </StackPanel> - </Grid> -</Page> \ No newline at end of file + </uc:Expander> + </StackPanel> + </StackPanel> + </Grid> +</Page> diff --git a/Emerald/App.xaml.cs b/Emerald/App.xaml.cs index fddb6cb3..acd2d2c1 100644 --- a/Emerald/App.xaml.cs +++ b/Emerald/App.xaml.cs @@ -33,7 +33,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args) #if DEBUG - MainWindow.EnableHotReload(); + MainWindow.UseStudio(); #endif MainWindow.SetWindowIcon(); diff --git a/Emerald/DirectResources.cs b/Emerald/DirectResources.cs new file mode 100644 index 00000000..f2d25777 --- /dev/null +++ b/Emerald/DirectResources.cs @@ -0,0 +1,39 @@ +using CommunityToolkit.WinUI.Helpers; +using Emerald.Helpers; +using System.Reflection; +using System.Runtime.InteropServices; +using Windows.UI; + +namespace Emerald; + +public static class DirectResoucres +{ + public static int MaxRAM + => Extensions.GetMemoryGB() * 1024; + + public static int MinRAM + => 512; + + //Used this thing for major setting changes because older settings could crash the program + public static string SettingsAPIVersion + => "1.3"; + + public static string BuildType + { + get + { +#if DEBUG + return "DEBUG"; +#else + return "RELEASE"; +#endif + } + } + public static Architecture Architecture => RuntimeInformation.ProcessArchitecture; + + public static string AppVersion + => Assembly.GetExecutingAssembly().GetName().Version.ToString(); + + public static Color LayerFillColorDefaultColor + => (Color)App.Current.Resources["LayerFillColorDefault"]; +} diff --git a/Emerald/Emerald.csproj b/Emerald/Emerald.csproj index 6339dada..e865a3aa 100644 --- a/Emerald/Emerald.csproj +++ b/Emerald/Emerald.csproj @@ -1,8 +1,8 @@ -<Project Sdk="Uno.Sdk"> +<Project Sdk="Uno.Sdk"> <PropertyGroup> <TargetFrameworks> net8.0-maccatalyst; - net8.0-windows10.0.19041; + net8.0-windows10.0.22621; net8.0-desktop; </TargetFrameworks> @@ -26,8 +26,6 @@ the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref. --> - <!-- <WindowsSdkPackageVersion>10.0.22621.28</WindowsSdkPackageVersion> --> - <!-- I had to add this unless it throws an error, with duplicate Webview files. <ErrorOnDuplicatePublishOutputFiles>true</ErrorOnDuplicatePublishOutputFiles> @@ -49,10 +47,14 @@ <ItemGroup> <None Remove="Assets\icon.png" /> + <None Remove="UserControls\ArgumentsListView.xaml" /> <None Remove="UserControls\Titlebar.xaml" /> + <None Remove="Views\Settings\GeneralPage.xaml" /> <None Remove="Views\Settings\SettingsPage.xaml" /> </ItemGroup> <ItemGroup> + <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" /> + <PackageReference Include="CommunityToolkit.WinUI.Helpers" /> <PackageReference Include="Microsoft.Windows.CsWin32"> <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> @@ -74,4 +76,18 @@ </Page> </ItemGroup> + <ItemGroup> + <UpToDateCheckInput Remove="Views\Settings\GeneralPage.xaml" /> + </ItemGroup> + + <ItemGroup> + <Page Update="Views\Settings\GeneralPage.xaml"> + <Generator>MSBuild:Compile</Generator> + </Page> + </ItemGroup> + + <ItemGroup> + <UpToDateCheckInput Remove="UserControls\ArgumentsListView.xaml" /> + </ItemGroup> + </Project> diff --git a/Emerald/Helpers/Settings/Enums/MicaTintColor.cs b/Emerald/Helpers/Settings/Enums/MicaTintColor.cs index 3c338142..a92be213 100644 --- a/Emerald/Helpers/Settings/Enums/MicaTintColor.cs +++ b/Emerald/Helpers/Settings/Enums/MicaTintColor.cs @@ -1,9 +1,8 @@ -namespace Emerald.Helpers.Settings.Enums +namespace Emerald.Helpers.Settings.Enums; + +public enum MicaTintColor : int { - public enum MicaTintColor : int - { - NoColor = 0, - AccentColor = 1, - CustomColor = 2 - } + NoColor = 0, + AccentColor = 1, + CustomColor = 2 } diff --git a/Emerald/Helpers/WindowManager.cs b/Emerald/Helpers/WindowManager.cs index 63761d89..28629aee 100644 --- a/Emerald/Helpers/WindowManager.cs +++ b/Emerald/Helpers/WindowManager.cs @@ -9,168 +9,167 @@ using WinRT; using WinRT.Interop; -namespace Emerald.Helpers -{ +namespace Emerald.Helpers; + #if WINDOWS - public static class WindowManager +public static class WindowManager +{ + /// <summary> + /// Add mica and the icon to the <paramref name="window"/> + /// </summary> + public static MicaBackground IntializeWindow(Window window) { - /// <summary> - /// Add mica and the icon to the <paramref name="window"/> - /// </summary> - public static MicaBackground IntializeWindow(Window window) - { - var s = new MicaBackground(window); - s.TrySetMicaBackdrop(); - return s; - } + var s = new MicaBackground(window); + s.TrySetMicaBackdrop(); + return s; + } - /// <summary> - /// Sets the customized titlebar if supported - /// </summary> - /// <exception cref="NullReferenceException"/> - public static void SetTitleBar(Window window, UIElement AppTitleBar) + /// <summary> + /// Sets the customized titlebar if supported + /// </summary> + /// <exception cref="NullReferenceException"/> + public static void SetTitleBar(Window window, UIElement AppTitleBar) + { + FrameworkElement RootUI = (FrameworkElement)window.Content; + if (AppWindowTitleBar.IsCustomizationSupported()) { - FrameworkElement RootUI = (FrameworkElement)window.Content; - if (AppWindowTitleBar.IsCustomizationSupported()) - { - var titlebar = window.AppWindow.TitleBar; - titlebar.ExtendsContentIntoTitleBar = true; + var titlebar = window.AppWindow.TitleBar; + titlebar.ExtendsContentIntoTitleBar = true; - void SetColor(ElementTheme acualTheme) + void SetColor(ElementTheme acualTheme) + { + titlebar.ButtonBackgroundColor = titlebar.ButtonInactiveBackgroundColor = titlebar.ButtonPressedBackgroundColor = Colors.Transparent; + switch (acualTheme) { - titlebar.ButtonBackgroundColor = titlebar.ButtonInactiveBackgroundColor = titlebar.ButtonPressedBackgroundColor = Colors.Transparent; - switch (acualTheme) - { - case ElementTheme.Dark: - titlebar.ButtonHoverBackgroundColor = Colors.Black; - titlebar.ButtonForegroundColor = Colors.White; - titlebar.ButtonHoverForegroundColor = Colors.White; - titlebar.ButtonPressedForegroundColor = Colors.Silver; - break; - case ElementTheme.Light: - titlebar.ButtonHoverBackgroundColor = Colors.White; - titlebar.ButtonForegroundColor = Colors.Black; - titlebar.ButtonHoverForegroundColor = Colors.Black; - titlebar.ButtonPressedForegroundColor = Colors.DarkGray; - break; - } + case ElementTheme.Dark: + titlebar.ButtonHoverBackgroundColor = Colors.Black; + titlebar.ButtonForegroundColor = Colors.White; + titlebar.ButtonHoverForegroundColor = Colors.White; + titlebar.ButtonPressedForegroundColor = Colors.Silver; + break; + case ElementTheme.Light: + titlebar.ButtonHoverBackgroundColor = Colors.White; + titlebar.ButtonForegroundColor = Colors.Black; + titlebar.ButtonHoverForegroundColor = Colors.Black; + titlebar.ButtonPressedForegroundColor = Colors.DarkGray; + break; } - - RootUI.ActualThemeChanged += (s, _) => SetColor(s.ActualTheme); - window.SetTitleBar(AppTitleBar); - SetColor(RootUI.ActualTheme); - } - else - { - window.ExtendsContentIntoTitleBar = true; - window.SetTitleBar(AppTitleBar); } + + RootUI.ActualThemeChanged += (s, _) => SetColor(s.ActualTheme); + window.SetTitleBar(AppTitleBar); + SetColor(RootUI.ActualTheme); + } + else + { + window.ExtendsContentIntoTitleBar = true; + window.SetTitleBar(AppTitleBar); } } +} + +public class WindowsSystemDispatcherQueueHelper +{ + private object? _dispatcherQueueController; - public class WindowsSystemDispatcherQueueHelper + [StructLayout(LayoutKind.Sequential)] + internal struct DispatcherQueueOptions { - private object? _dispatcherQueueController; + internal int dwSize; + internal int threadType; + internal int apartmentType; + } - [StructLayout(LayoutKind.Sequential)] - internal struct DispatcherQueueOptions + [DllImport("CoreMessaging.dll")] + private static extern int CreateDispatcherQueueController([In] DispatcherQueueOptions options, [In, Out, MarshalAs(UnmanagedType.IUnknown)] ref object? dispatcherQueueController); + + public void EnsureWindowsSystemDispatcherQueueController() + { + if (Windows.System.DispatcherQueue.GetForCurrentThread() != null) { - internal int dwSize; - internal int threadType; - internal int apartmentType; + // one already exists, so we'll just use it. + return; } - [DllImport("CoreMessaging.dll")] - private static extern int CreateDispatcherQueueController([In] DispatcherQueueOptions options, [In, Out, MarshalAs(UnmanagedType.IUnknown)] ref object? dispatcherQueueController); - - public void EnsureWindowsSystemDispatcherQueueController() + if (_dispatcherQueueController == null) { - if (Windows.System.DispatcherQueue.GetForCurrentThread() != null) - { - // one already exists, so we'll just use it. - return; - } - - if (_dispatcherQueueController == null) - { - DispatcherQueueOptions options; - options.dwSize = Marshal.SizeOf(typeof(DispatcherQueueOptions)); - options.threadType = 2; - options.apartmentType = 2; + DispatcherQueueOptions options; + options.dwSize = Marshal.SizeOf(typeof(DispatcherQueueOptions)); + options.threadType = 2; + options.apartmentType = 2; - CreateDispatcherQueueController(options, ref _dispatcherQueueController); - } + CreateDispatcherQueueController(options, ref _dispatcherQueueController); } } +} - public class MicaBackground +public class MicaBackground +{ + private readonly Window _window; + public readonly MicaController MicaController = new(); + private SystemBackdropConfiguration _backdropConfiguration = new(); + private readonly WindowsSystemDispatcherQueueHelper _dispatcherQueueHelper = new(); + + public MicaBackground(Window window) { - private readonly Window _window; - public readonly MicaController MicaController = new(); - private SystemBackdropConfiguration _backdropConfiguration = new(); - private readonly WindowsSystemDispatcherQueueHelper _dispatcherQueueHelper = new(); + _window = window; + } - public MicaBackground(Window window) + public bool TrySetMicaBackdrop() + { + if (MicaController.IsSupported()) { - _window = window; - } + _dispatcherQueueHelper.EnsureWindowsSystemDispatcherQueueController(); + _window.Activated += WindowOnActivated; + _window.Closed += WindowOnClosed; + ((FrameworkElement)_window.Content).ActualThemeChanged += MicaBackground_ActualThemeChanged; + _backdropConfiguration.IsInputActive = true; - public bool TrySetMicaBackdrop() - { - if (MicaController.IsSupported()) + _backdropConfiguration.Theme = _window.Content switch { - _dispatcherQueueHelper.EnsureWindowsSystemDispatcherQueueController(); - _window.Activated += WindowOnActivated; - _window.Closed += WindowOnClosed; - ((FrameworkElement)_window.Content).ActualThemeChanged += MicaBackground_ActualThemeChanged; - _backdropConfiguration.IsInputActive = true; - - _backdropConfiguration.Theme = _window.Content switch - { - FrameworkElement { ActualTheme: ElementTheme.Dark } => SystemBackdropTheme.Dark, - FrameworkElement { ActualTheme: ElementTheme.Light } => SystemBackdropTheme.Light, - FrameworkElement { ActualTheme: ElementTheme.Default } => SystemBackdropTheme.Default, - _ => throw new InvalidOperationException("Unknown theme") - }; + FrameworkElement { ActualTheme: ElementTheme.Dark } => SystemBackdropTheme.Dark, + FrameworkElement { ActualTheme: ElementTheme.Light } => SystemBackdropTheme.Light, + FrameworkElement { ActualTheme: ElementTheme.Default } => SystemBackdropTheme.Default, + _ => throw new InvalidOperationException("Unknown theme") + }; - MicaController.AddSystemBackdropTarget(_window.As<ICompositionSupportsSystemBackdrop>()); - MicaController.SetSystemBackdropConfiguration(_backdropConfiguration); + MicaController.AddSystemBackdropTarget(_window.As<ICompositionSupportsSystemBackdrop>()); + MicaController.SetSystemBackdropConfiguration(_backdropConfiguration); - return true; - } - - return false; + return true; } - private void MicaBackground_ActualThemeChanged(FrameworkElement sender, object args) - { - if (_backdropConfiguration != null) - { - SetConfigurationSourceTheme(); - } - } + return false; + } - private void SetConfigurationSourceTheme() + private void MicaBackground_ActualThemeChanged(FrameworkElement sender, object args) + { + if (_backdropConfiguration != null) { - switch (((FrameworkElement)_window.Content).ActualTheme) - { - case ElementTheme.Dark: _backdropConfiguration.Theme = SystemBackdropTheme.Dark; break; - case ElementTheme.Light: _backdropConfiguration.Theme = SystemBackdropTheme.Light; break; - case ElementTheme.Default: _backdropConfiguration.Theme = SystemBackdropTheme.Default; break; - } + SetConfigurationSourceTheme(); } + } - private void WindowOnClosed(object sender, WindowEventArgs args) + private void SetConfigurationSourceTheme() + { + switch (((FrameworkElement)_window.Content).ActualTheme) { - MicaController.Dispose(); - _window.Activated -= WindowOnActivated; - _backdropConfiguration = null!; + case ElementTheme.Dark: _backdropConfiguration.Theme = SystemBackdropTheme.Dark; break; + case ElementTheme.Light: _backdropConfiguration.Theme = SystemBackdropTheme.Light; break; + case ElementTheme.Default: _backdropConfiguration.Theme = SystemBackdropTheme.Default; break; } + } - private void WindowOnActivated(object sender, WindowActivatedEventArgs args) - { - _backdropConfiguration.IsInputActive = args.WindowActivationState is not WindowActivationState.Deactivated; - } + private void WindowOnClosed(object sender, WindowEventArgs args) + { + MicaController.Dispose(); + _window.Activated -= WindowOnActivated; + _backdropConfiguration = null!; + } + + private void WindowOnActivated(object sender, WindowActivatedEventArgs args) + { + _backdropConfiguration.IsInputActive = args.WindowActivationState is not WindowActivationState.Deactivated; } -#endif } +#endif diff --git a/Emerald/Models/ArgTemplate.cs b/Emerald/Models/ArgTemplate.cs new file mode 100644 index 00000000..ee708800 --- /dev/null +++ b/Emerald/Models/ArgTemplate.cs @@ -0,0 +1,13 @@ +using CommunityToolkit.Mvvm.ComponentModel; + +namespace Emerald.Models; + +//Copied from Emerald.UWP +[ObservableObject] +public partial class ArgTemplate +{ + [ObservableProperty] + private string arg; + + public int Count { get; set; } +} diff --git a/Emerald/UserControls/ArgumentsListView.xaml b/Emerald/UserControls/ArgumentsListView.xaml new file mode 100644 index 00000000..ca819bcd --- /dev/null +++ b/Emerald/UserControls/ArgumentsListView.xaml @@ -0,0 +1,62 @@ +<UserControl + x:Class="Emerald.UserControls.ArgumentsListView" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:Emerald.UserControls" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + mc:Ignorable="d" + d:DesignHeight="300" + xmlns:models="using:Emerald.Models" + d:DesignWidth="400"> + <Grid> + <Grid.Resources> + <ResourceDictionary> + <SolidColorBrush x:Key="TextBoxBackground" Color="Transparent" /> + <SolidColorBrush x:Key="TextBoxBackgroundPointerOver" Color="Transparent" /> + <SolidColorBrush x:Key="TextBoxBackgroundPressed" Color="Transparent" /> + </ResourceDictionary> + </Grid.Resources> + <StackPanel> + <StackPanel Margin="0,5" Orientation="Horizontal"> + <Button + x:Name="btnAdd" + Padding="7" + Click="btnAdd_Click"> + <FontIcon Glyph="" /> + </Button> + <Button + x:Name="btnRemove" + Margin="5,0,0,0" + Padding="7" + Click="btnRemove_Click"> + <FontIcon Glyph="" /> + </Button> + </StackPanel> + <ListView x:Name="view" SelectionChanged="view_SelectionChanged"> + <ListView.Resources> + <SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="Transparent" /> + </ListView.Resources> + <ListView.ItemContainerTransitions> + <TransitionCollection> + <AddDeleteThemeTransition /> + </TransitionCollection> + </ListView.ItemContainerTransitions> + <ListView.ItemTemplate> + <DataTemplate x:DataType="models:ArgTemplate"> + <TextBox + Margin="-9,-4" + VerticalAlignment="Stretch" + Background="Transparent" + BorderThickness="0" + GotFocus="TextBox_GotFocus" + PlaceholderText="Empty" + PointerPressed="TextBox_PointerPressed" + Text="{x:Bind Arg,Mode=TwoWay}" + TextChanged="TextBox_TextChanged" /> + </DataTemplate> + </ListView.ItemTemplate> + </ListView> + </StackPanel> + </Grid> +</UserControl> diff --git a/Emerald/UserControls/ArgumentsListView.xaml.cs b/Emerald/UserControls/ArgumentsListView.xaml.cs new file mode 100644 index 00000000..6ac337f1 --- /dev/null +++ b/Emerald/UserControls/ArgumentsListView.xaml.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; +using System.Collections.ObjectModel; +using SS = Emerald.Helpers.Settings.SettingsSystem; +using Emerald.Models; + + +namespace Emerald.UserControls; + + //Copied from Emerald.UWP + public sealed partial class ArgumentsListView : UserControl + { + private int count = 0; + public ArgumentsListView() + { + InitializeComponent(); + view.ItemsSource = Source; + UpdateSource(); + } + + private ObservableCollection<ArgTemplate> Source = new(); + private void btnAdd_Click(object sender, RoutedEventArgs e) + { + count++; + var r = new ArgTemplate { Arg = "", Count = count }; + Source.Add(r); + UpdateMainSource(); + view.SelectedItem = r; + } + public void UpdateSource() + { + Source.Clear(); + if (SS.Settings.Minecraft.JVM.Arguments != null) + { + foreach (var item in SS.Settings.Minecraft.JVM.Arguments) + { + count++; + var r = new ArgTemplate { Arg = item, Count = count }; + r.PropertyChanged += (_, _) => + { + UpdateMainSource(); + }; + Source.Add(r); + } + } + btnRemove.IsEnabled = Source.Any(); + } + private void UpdateMainSource() => + SS.Settings.Minecraft.JVM.Arguments = Source.Select(x => x.Arg).ToArray(); + + private void btnRemove_Click(object sender, RoutedEventArgs e) + { + foreach (var item in view.SelectedItems) + { + Source.Remove((ArgTemplate)item); + } + UpdateMainSource(); + } + + private void TextBox_PointerPressed(object sender, PointerRoutedEventArgs e) + { + view.SelectedIndex = Source.IndexOf(Source.FirstOrDefault(x => x.Count == ((sender as FrameworkElement).DataContext as ArgTemplate).Count)); + } + + private void TextBox_TextChanged(object sender, TextChangedEventArgs e) + { + view.SelectedIndex = Source.IndexOf(Source.FirstOrDefault(x => x.Count == ((sender as FrameworkElement).DataContext as ArgTemplate).Count)); + UpdateMainSource(); + } + + private void TextBox_GotFocus(object sender, RoutedEventArgs e) + { + view.SelectedIndex = Source.IndexOf(Source.FirstOrDefault(x => x.Count == ((sender as FrameworkElement).DataContext as ArgTemplate).Count)); + } + + private void view_SelectionChanged(object sender, SelectionChangedEventArgs e) + { + btnRemove.IsEnabled = view.SelectedItems.Any(); + } + } diff --git a/Emerald/Views/Settings/GeneralPage.xaml b/Emerald/Views/Settings/GeneralPage.xaml new file mode 100644 index 00000000..c998ca54 --- /dev/null +++ b/Emerald/Views/Settings/GeneralPage.xaml @@ -0,0 +1,149 @@ +<Page + x:Class="Emerald.Views.Settings.GeneralPage" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:Emerald.Views.Settings" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + mc:Ignorable="d" xmlns:Main="using:Emerald" xmlns:SS="using:Emerald.Helpers.Settings" xmlns:helpers="using:Emerald.Helpers" + DataContext="{x:Bind SS:SettingsSystem.Settings}" xmlns:cn="using:CommunityToolkit.WinUI.Controls" xmlns:uc="using:Emerald.UserControls"> + <Grid> + <StackPanel Spacing="16"> + <StackPanel Spacing="4"> + <TextBlock FontWeight="SemiBold" Text="{helpers:Localize Name=GeneralSettings}" /> + <cn:SettingsCard + HeaderIcon="{helpers:FontIcon Glyph=}" + Header="{helpers:Localize Name=MinecraftPath}" + Description="{helpers:Localize Name=MinecraftPathDescription}"> + <HyperlinkButton + ToolTipService.ToolTip="{Binding Minecraft.Path, Mode=OneWay}" + Click="btnChangeMPath_Click"> + <TextBlock + MaxWidth="250" + VerticalAlignment="Center" + Text="{Binding Minecraft.Path, Mode=OneWay}" + TextTrimming="CharacterEllipsis" /> + </HyperlinkButton> + </cn:SettingsCard> + <cn:SettingsCard + HeaderIcon="{helpers:FontIcon Glyph=}" + Header="{helpers:Localize Name=RAM}" + Description="{helpers:Localize Name=RAMDescription}"> + <StackPanel + Orientation="Horizontal" + Spacing="5"> + <TextBlock + x:Name="txtRam" + VerticalAlignment="Center"> + <Run + Text="{Binding Minecraft.RAMinGB, Mode=OneWay}" /> + GB</TextBlock> + <RepeatButton + Padding="5" + Click="btnRamPlus_Click" + Content="{helpers:FontIcon Glyph=}" + FontWeight="SemiBold" /> + <RepeatButton + Padding="5" + Click="btnRamMinus_Click" + Content="{helpers:FontIcon Glyph=}" + FontWeight="SemiBold" /> + </StackPanel> + </cn:SettingsCard> + <cn:SettingsExpander + Header="{helpers:Localize Name=DownloadSettings}" + HeaderIcon="{helpers:FontIcon Glyph=}" + Description="{helpers:Localize Name=DownloadSettingsDescription}"> + <cn:SettingsExpander.Items> + <cn:SettingsCard + Header="{helpers:Localize Name=AssetsCheck}"> + <ToggleSwitch + IsOn="{Binding Minecraft.Downloader.AssetsCheck, Mode=TwoWay}" /> + </cn:SettingsCard> + <cn:SettingsCard + Header="{helpers:Localize Name=HashCheck}"> + <ToggleSwitch + IsOn="{Binding Minecraft.Downloader.HashCheck, Mode=TwoWay}" /> + </cn:SettingsCard> + </cn:SettingsExpander.Items> + </cn:SettingsExpander> + <cn:SettingsCard + Header="{helpers:Localize Name=AutoLogin}" + Description="{helpers:Localize Name=AutoLoginDescription}" + HeaderIcon="{helpers:FontIcon Glyph=}"> + <ToggleSwitch + IsOn="{Binding App.AutoLogin, Mode=TwoWay}" + OffContent="{helpers:Localize Name=No}" + OnContent="{helpers:Localize Name=Yes}" /> + </cn:SettingsCard> + </StackPanel> + <StackPanel + Spacing="4"> + <TextBlock + FontWeight="SemiBold" + Text="{helpers:Localize Name=AdvancedMinecraftSettings}" /> + <cn:SettingsCard + Header="{helpers:Localize Name=MCasAdmin}" + Description="{helpers:Localize Name=MCasAdminDescription}" + HeaderIcon="{helpers:FontIcon Glyph=}"> + <ToggleSwitch + IsOn="{Binding Minecraft.IsAdmin, Mode=TwoWay}" + OffContent="{helpers:Localize Name=No}" + OnContent="{helpers:Localize Name=Yes}" /> + </cn:SettingsCard> + <cn:SettingsCard + Header="{helpers:Localize Name=GameLogs}" + Description="{helpers:Localize Name=GameLogsDescription}" + HeaderIcon="{helpers:FontIcon Glyph=}"> + <ToggleSwitch + IsOn="{Binding Minecraft.JVM.GameLogs, Mode=TwoWay}" + OffContent="{helpers:Localize Name=No}" + OnContent="{helpers:Localize Name=Yes}" /> + </cn:SettingsCard> + <cn:SettingsExpander + Header="{helpers:Localize Name=MCWindowsSize}" + Description="{helpers:Localize Name=MCWindowsSizeDescription}" + HeaderIcon="{helpers:FontIcon Glyph=}"> + <cn:SettingsExpander.Content> + <TextBlock + Text="{Binding Minecraft.JVM.ScreenSizeStatus, Mode=OneWay}" /> + </cn:SettingsExpander.Content> + <cn:SettingsExpander.Items> + <cn:SettingsCard + Header="{helpers:Localize Name=Width}"> + <NumberBox + Minimum="0" + Value="{Binding Minecraft.JVM.ScreenWidth, Mode=TwoWay}" + SpinButtonPlacementMode="Inline" + LargeChange="80" + SmallChange="10" + PlaceholderText="{helpers:Localize Name=Default}" /> + </cn:SettingsCard> + <cn:SettingsCard + Header="{helpers:Localize Name=Height}"> + <NumberBox + Minimum="0" + Value="{Binding Minecraft.JVM.ScreenHeight, Mode=TwoWay}" + SpinButtonPlacementMode="Inline" + LargeChange="80" + SmallChange="10" + PlaceholderText="{helpers:Localize Name=Default}" /> + </cn:SettingsCard> + <cn:SettingsCard + Header="{helpers:Localize Name=FullScreen}"> + <ToggleSwitch + IsOn="{Binding Minecraft.JVM.FullScreen, Mode=TwoWay}" /> + </cn:SettingsCard> + </cn:SettingsExpander.Items> + </cn:SettingsExpander> + <cn:SettingsExpander + Header="{helpers:Localize Name=JVMArgs}" + Description="{helpers:Localize Name=JVMArgsDescription}" + HeaderIcon="{helpers:FontIcon Glyph=}"> + <cn:SettingsExpander.ItemsHeader> + <Grid + Padding="12" + Background="{StaticResource ExpanderHeaderBackground}"> + <uc:ArgumentsListView /> + </Grid> + </cn:SettingsExpander.ItemsHeader> + </cn:SettingsExpander> + </StackPanel> + </StackPanel> + </Grid> +</Page> diff --git a/Emerald/Views/Settings/GeneralPage.xaml.cs b/Emerald/Views/Settings/GeneralPage.xaml.cs new file mode 100644 index 00000000..5f0e5161 --- /dev/null +++ b/Emerald/Views/Settings/GeneralPage.xaml.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using CmlLib.Core; +using CommunityToolkit.WinUI.Controls; +using Emerald.Helpers; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; +using Windows.Foundation; +using Windows.Foundation.Collections; +using Windows.Storage.Pickers; + +using SS = Emerald.Helpers.Settings.SettingsSystem; +// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238 + +namespace Emerald.Views.Settings; +/// <summary> +/// An empty page that can be used on its own or navigated to within a Frame. +/// </summary> +public sealed partial class GeneralPage : Page +{ + public GeneralPage() + { + this.InitializeComponent(); + } + private void btnChangeMPath_Click(object sender, RoutedEventArgs e) + { + //MinecraftPath mcP; + //string path = ""; + //async void Start() + //{ + // var fop = new FolderPicker + // { + // CommitButtonText = "Select".Localize() + // }; + // WinRT.Interop.InitializeWithWindow.Initialize(fop, WinRT.Interop.WindowNative.GetWindowHandle(App.Current.MainWindow)); + // var f = await fop.PickSingleFolderAsync(); + + // if (f != null) + // path = f.Path; + // else + // return; + + // Try(); + + // async void Try() + // { + // try + // { + // mcP = new(path); + // SS.Settings.Minecraft.Path = path; + // App.Current.Launcher.InitializeLauncher(mcP); + // } + // catch + // { + // var r = await MessageBox.Show("Error".Localize(), "MCPathFailed".Localize().Replace("{Path}", path), MessageBoxButtons.Custom, "Yes".Localize(), "SetDifMCPath".Localize()); + // if (r == MessageBoxResults.Yes) + // Try(); + // else + // Start(); + // } + // } + //} + //Start(); + } + + private void btnRamPlus_Click(object sender, RoutedEventArgs e) => + SS.Settings.Minecraft.RAM = SS.Settings.Minecraft.RAM + (SS.Settings.Minecraft.RAM >= DirectResoucres.MaxRAM ? 0 : (DirectResoucres.MaxRAM - SS.Settings.Minecraft.RAM >= 50 ? 50 : DirectResoucres.MaxRAM - SS.Settings.Minecraft.RAM)); + + + private void btnRamMinus_Click(object sender, RoutedEventArgs e) => + SS.Settings.Minecraft.RAM = SS.Settings.Minecraft.RAM - (SS.Settings.Minecraft.RAM <= DirectResoucres.MinRAM ? 0 : 50); + + + private void btnAutoRAM_Click(object sender, RoutedEventArgs e) => + SS.Settings.Minecraft.RAM = DirectResoucres.MaxRAM / 2; +} diff --git a/Emerald/Views/Settings/SettingsPage.xaml b/Emerald/Views/Settings/SettingsPage.xaml index 4587aa96..4d7b56dc 100644 --- a/Emerald/Views/Settings/SettingsPage.xaml +++ b/Emerald/Views/Settings/SettingsPage.xaml @@ -61,7 +61,7 @@ BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" BorderThickness="0,1,0,0"> <ScrollViewer> - <Frame x:Name="contentframe" /> + <Frame Padding="16" x:Name="contentframe" /> </ScrollViewer> </Grid> </Grid> diff --git a/Emerald/Views/Settings/SettingsPage.xaml.cs b/Emerald/Views/Settings/SettingsPage.xaml.cs index 9e10d21a..4720b56c 100644 --- a/Emerald/Views/Settings/SettingsPage.xaml.cs +++ b/Emerald/Views/Settings/SettingsPage.xaml.cs @@ -2,44 +2,43 @@ using Microsoft.UI.Xaml.Media.Animation; using System; -namespace Emerald.Views.Settings +namespace Emerald.Views.Settings; + +public sealed partial class SettingsPage : Page { - public sealed partial class SettingsPage : Page + public SettingsPage() { - public SettingsPage() - { - InitializeComponent(); + InitializeComponent(); - //Loaded += (_, _) => Navigate(navView.SelectedItem as NavigationViewItem); - } + //Loaded += (_, _) => Navigate(navView.SelectedItem as NavigationViewItem); + } - private void navView_ItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args) - { - Navigate(navView.SelectedItem as NavigationViewItem); - } + private void navView_ItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args) + { + Navigate(navView.SelectedItem as NavigationViewItem); + } - private void Navigate(NavigationViewItem itm) + private void Navigate(NavigationViewItem itm) + { + switch (itm.Tag) { - switch (itm.Tag) - { - case "Appearance": - NavigateOnce(typeof(SettingsPage)); - break; - case "About": - NavigateOnce(typeof(SettingsPage)); - break; - default: - NavigateOnce(typeof(SettingsPage)); - break; - } + case "Appearance": + NavigateOnce(typeof(SettingsPage)); + break; + case "About": + NavigateOnce(typeof(SettingsPage)); + break; + default: + NavigateOnce(typeof(GeneralPage)); + break; } + } - private void NavigateOnce(Type type) + private void NavigateOnce(Type type) + { + if (contentframe.Content == null || contentframe.Content.GetType() != type) { - if (contentframe.Content == null || contentframe.Content.GetType() != type) - { - contentframe.Navigate(type, null, new DrillInNavigationTransitionInfo()); - } + contentframe.Navigate(type, null, new DrillInNavigationTransitionInfo()); } } } From 9288eadfb24adab84be32d56f5b0d0dc53806f25 Mon Sep 17 00:00:00 2001 From: NoobNotFound <chanirurajapakse@gmail.com> Date: Sat, 30 Nov 2024 21:31:06 +0530 Subject: [PATCH 61/61] add old localizations --- Emerald/Emerald.csproj | 4 +- Emerald/Strings/en/Resources.resw | 693 ++++++++++++++++++++++++++++-- 2 files changed, 667 insertions(+), 30 deletions(-) diff --git a/Emerald/Emerald.csproj b/Emerald/Emerald.csproj index e865a3aa..523591d0 100644 --- a/Emerald/Emerald.csproj +++ b/Emerald/Emerald.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Uno.Sdk"> +<Project Sdk="Uno.Sdk"> <PropertyGroup> <TargetFrameworks> net8.0-maccatalyst; @@ -14,7 +14,7 @@ <!-- App Identifier --> <ApplicationId>Riverside.Emerald</ApplicationId> <!-- Versions --> - <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion> + <ApplicationDisplayVersion>1.0.0.0</ApplicationDisplayVersion> <ApplicationVersion>1</ApplicationVersion> <!-- If you encounter this error message: diff --git a/Emerald/Strings/en/Resources.resw b/Emerald/Strings/en/Resources.resw index a311865f..7297f452 100644 --- a/Emerald/Strings/en/Resources.resw +++ b/Emerald/Strings/en/Resources.resw @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <root> - <!-- - Microsoft ResX Schema - + <!-- + Microsoft ResX Schema + Version 2.0 - - The primary goals of this format is to allow a simple XML format - that is mostly human readable. The generation and parsing of the - various data types are done through the TypeConverter classes + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes associated with the data types. - + Example: - + ... ado.net/XML headers & schema ... <resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="version">2.0</resheader> @@ -26,36 +26,36 @@ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> <comment>This is a comment</comment> </data> - - There are any number of "resheader" rows that contain simple + + There are any number of "resheader" rows that contain simple name/value pairs. - - Each data row contains a name, and value. The row also contains a - type or mimetype. Type corresponds to a .NET class that support - text/value conversion through the TypeConverter architecture. - Classes that don't support this are serialized and stored with the + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the mimetype set. - - The mimetype is used for serialized objects, and tells the - ResXResourceReader how to depersist the object. This is currently not + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not extensible. For a given mimetype the value must be set accordingly: - - Note - application/x-microsoft.net.object.binary.base64 is the format - that the ResXResourceWriter will generate, however the reader can + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can read any of the formats listed below. - + mimetype: application/x-microsoft.net.object.binary.base64 - value : The object must be serialized with + value : The object must be serialized with : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. - + mimetype: application/x-microsoft.net.object.soap.base64 - value : The object must be serialized with + value : The object must be serialized with : System.Runtime.Serialization.Formatters.Soap.SoapFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.bytearray.base64 - value : The object must be serialized into a byte array + value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> @@ -120,4 +120,641 @@ <data name="ApplicationName" xml:space="preserve"> <value>Emerald-en</value> </data> -</root> + <data name="About" xml:space="preserve"> + <value>About</value> + </data> + <data name="AccentColor" xml:space="preserve"> + <value>Accent color</value> + </data> + <data name="AccessToken" xml:space="preserve"> + <value>Access token</value> + </data> + <data name="AccountDetails" xml:space="preserve"> + <value>Account Details</value> + </data> + <data name="Accounts" xml:space="preserve"> + <value>Accounts</value> + </data> + <data name="AccountType" xml:space="preserve"> + <value>Account Type</value> + </data> + <data name="Add" xml:space="preserve"> + <value>Add</value> + </data> + <data name="AdvancedMinecraftSettings" xml:space="preserve"> + <value>Advanced Settings</value> + </data> + <data name="All" xml:space="preserve"> + <value>All</value> + </data> + <data name="alpha" xml:space="preserve"> + <value>Alpha</value> + </data> + <data name="Appearance" xml:space="preserve"> + <value>Appearance</value> + </data> + <data name="AssetsCheck" xml:space="preserve"> + <value>Assets check</value> + </data> + <data name="AuthWindowshello" xml:space="preserve"> + <value>Authenticating using Windows Hello...</value> + </data> + <data name="AutoDownloadUpdates" xml:space="preserve"> + <value>Automatically download updates if available</value> + </data> + <data name="AutoLogin" xml:space="preserve"> + <value>Auto login</value> + </data> + <data name="AutoLoginDescription" xml:space="preserve"> + <value>Automatically tries to login with the most recent account at startup</value> + </data> + <data name="BegLogIn" xml:space="preserve"> + <value>Please Login</value> + </data> + <data name="BegVer" xml:space="preserve"> + <value>Please enter a version</value> + </data> + <data name="beta" xml:space="preserve"> + <value>Beta</value> + </data> + <data name="BuildType" xml:space="preserve"> + <value>Build type</value> + </data> + <data name="Changelogs" xml:space="preserve"> + <value>Changelogs</value> + </data> + <data name="CheckForUpdates" xml:space="preserve"> + <value>Check for updates</value> + </data> + <data name="CheckForUpdatesAtStartup" xml:space="preserve"> + <value>Check for updates when app starts</value> + </data> + <data name="CheckingUpdates" xml:space="preserve"> + <value>Checking for updates</value> + </data> + <data name="CheckNow" xml:space="preserve"> + <value>Check Now</value> + </data> + <data name="ChooseAccount" xml:space="preserve"> + <value>Choose an account</value> + </data> + <data name="ChooseAVersion" xml:space="preserve"> + <value>Choose a version</value> + </data> + <data name="Clear" xml:space="preserve"> + <value>Clear</value> + </data> + <data name="ClearAll" xml:space="preserve"> + <value>Clear All</value> + </data> + <data name="Colorful" xml:space="preserve"> + <value>Colorful</value> + </data> + <data name="ColorMode" xml:space="preserve"> + <value>Color Mode</value> + </data> + <data name="ColorModeDescription" xml:space="preserve"> + <value>Choose your color</value> + </data> + <data name="ConfigureOptifine" xml:space="preserve"> + <value>Configure Optifine</value> + </data> + <data name="ConnectingGithub" xml:space="preserve"> + <value>Connecting to github</value> + </data> + <data name="Contribute" xml:space="preserve"> + <value>Contribute</value> + </data> + <data name="CopyVersion" xml:space="preserve"> + <value>Copy version</value> + </data> + <data name="CreateAColor" xml:space="preserve"> + <value>Create a color</value> + </data> + <data name="CreateBackup" xml:space="preserve"> + <value>Create Backup</value> + </data> + <data name="CreateOldSettingsBackup" xml:space="preserve"> + <value>Create a backup of the old settings</value> + </data> + <data name="Credits" xml:space="preserve"> + <value>Credits</value> + </data> + <data name="CreditsDescription" xml:space="preserve"> + <value>Respect...</value> + </data> + <data name="CustomColor" xml:space="preserve"> + <value>Custom color</value> + </data> + <data name="CustomColors" xml:space="preserve"> + <value>Custom colors</value> + </data> + <data name="Dark" xml:space="preserve"> + <value>Dark</value> + </data> + <data name="Default" xml:space="preserve"> + <value>Default</value> + </data> + <data name="Delete" xml:space="preserve"> + <value>Delete</value> + </data> + <data name="DeviceCode" xml:space="preserve"> + <value>Using DeviceCode API</value> + </data> + <data name="Discord" xml:space="preserve"> + <value>Discord</value> + </data> + <data name="Downgrade" xml:space="preserve"> + <value>Downgrade</value> + </data> + <data name="DowngradeAvailable" xml:space="preserve"> + <value>Downgrade Available</value> + </data> + <data name="DowngradeDescription" xml:space="preserve"> + <value>The current version is higher than the latest version in the servers. You must be using a private beta. Please wait until a higher stable version be available</value> + </data> + <data name="Download" xml:space="preserve"> + <value>Download</value> + </data> + <data name="DownloaderBusy" xml:space="preserve"> + <value>The mod downloader is busy</value> + </data> + <data name="Downloading" xml:space="preserve"> + <value>Downloading</value> + </data> + <data name="DownloadingUpdate" xml:space="preserve"> + <value>Download Update</value> + </data> + <data name="DownloadMod" xml:space="preserve"> + <value>Download Mod</value> + </data> + <data name="Downloads" xml:space="preserve"> + <value>Downloads</value> + </data> + <data name="DownloadSettings" xml:space="preserve"> + <value>Download Settings</value> + </data> + <data name="DownloadSettingsDescription" xml:space="preserve"> + <value>Optional. Recommended to turn these on</value> + </data> + <data name="Duplicate" xml:space="preserve"> + <value>Duplicate</value> + </data> + <data name="EmbededView" xml:space="preserve"> + <value>Using an embeded webview</value> + </data> + <data name="Empty" xml:space="preserve"> + <value>Empty</value> + </data> + <data name="Error" xml:space="preserve"> + <value>Error</value> + </data> + <data name="Finish" xml:space="preserve"> + <value>Finish!</value> + </data> + <data name="Followers" xml:space="preserve"> + <value>Followers</value> + </data> + <data name="FullScreen" xml:space="preserve"> + <value>Full Screen</value> + </data> + <data name="GameIsRunning" xml:space="preserve"> + <value>Game is running...</value> + </data> + <data name="GameLogs" xml:space="preserve"> + <value>Read game logs</value> + </data> + <data name="GameLogsDescription" xml:space="preserve"> + <value>For debug perposes</value> + </data> + <data name="General" xml:space="preserve"> + <value>General</value> + </data> + <data name="GeneralSettings" xml:space="preserve"> + <value>General Settings</value> + </data> + <data name="GetFabric" xml:space="preserve"> + <value>Get Fabric</value> + </data> + <data name="GetMods" xml:space="preserve"> + <value>Get Mods</value> + </data> + <data name="GettingFabric" xml:space="preserve"> + <value>Getting Fabric</value> + </data> + <data name="GettingInheritedVersion" xml:space="preserve"> + <value>Getting inherited version...</value> + </data> + <data name="GettingMods" xml:space="preserve"> + <value>Load Available Mods</value> + </data> + <data name="GettingOptifine" xml:space="preserve"> + <value>Getting Optifine...</value> + </data> + <data name="GettingVers" xml:space="preserve"> + <value>Getting available versions...</value> + </data> + <data name="GetVerFailed" xml:space="preserve"> + <value>Failed to get the version</value> + </data> + <data name="Github" xml:space="preserve"> + <value>Github</value> + </data> + <data name="GoodEvening" xml:space="preserve"> + <value>Good Evening</value> + </data> + <data name="GoodLuck" xml:space="preserve"> + <value>Good Luck</value> + </data> + <data name="GoodMorning" xml:space="preserve"> + <value>Good Morning</value> + </data> + <data name="GotIt" xml:space="preserve"> + <value>Got it!</value> + </data> + <data name="GotoLinkAndEnterDeviceCode" xml:space="preserve"> + <value>Go to {Link} and enter the code below to sign-in</value> + </data> + <data name="HashCheck" xml:space="preserve"> + <value>Hash check</value> + </data> + <data name="Height" xml:space="preserve"> + <value>Screen Height</value> + </data> + <data name="Home" xml:space="preserve"> + <value>Home</value> + </data> + <data name="IncludePreReleases" xml:space="preserve"> + <value>Include pre-releases</value> + </data> + <data name="InitializeCore" xml:space="preserve"> + <value>Initialize Launcher Core</value> + </data> + <data name="Install" xml:space="preserve"> + <value>Install</value> + </data> + <data name="InstallUpdate" xml:space="preserve"> + <value>Install Update</value> + </data> + <data name="JVMArgs" xml:space="preserve"> + <value>JVM Arguments</value> + </data> + <data name="JVMArgsDescription" xml:space="preserve"> + <value>For Endermans!</value> + </data> + <data name="Latest" xml:space="preserve"> + <value>Latest</value> + </data> + <data name="Launch" xml:space="preserve"> + <value>Launch!</value> + </data> + <data name="LaunchingMinecraft" xml:space="preserve"> + <value>Launching Minecraft...</value> + </data> + <data name="LaunchMC" xml:space="preserve"> + <value>Launch Minecraft</value> + </data> + <data name="Light" xml:space="preserve"> + <value>Light</value> + </data> + <data name="Links" xml:space="preserve"> + <value>Links</value> + </data> + <data name="LinksDescription" xml:space="preserve"> + <value>Keep up with the latest updates</value> + </data> + <data name="LoadChangeLogs" xml:space="preserve"> + <value>Load ChangeLogs</value> + </data> + <data name="LoadDownloadVers" xml:space="preserve"> + <value>Load Download Versions</value> + </data> + <data name="LoadingChangeLog" xml:space="preserve"> + <value>Loading ChangeLog</value> + </data> + <data name="LoadingDownloadVers" xml:space="preserve"> + <value>Loading Download Versions</value> + </data> + <data name="LoadingMod" xml:space="preserve"> + <value>Loading Mod</value> + </data> + <data name="LoadMod" xml:space="preserve"> + <value>Load Mod</value> + </data> + <data name="LoadSettingsFailed" xml:space="preserve"> + <value>Failed to load the app settings and accounts. The version of the setting system is different. You may have recently updated the app. Contact a developer of this app to recover the settings</value> + </data> + <data name="Login" xml:space="preserve"> + <value>Login</value> + </data> + <data name="LoginWithMicrosoft" xml:space="preserve"> + <value>Login with Microsoft</value> + </data> + <data name="Logs" xml:space="preserve"> + <value>Logs</value> + </data> + <data name="MainPage_Login" xml:space="preserve"> + <value>Login</value> + </data> + <data name="MainPage_txtbxStatus.PlaceholderText" xml:space="preserve"> + <value>For a better RPC please add a small status!</value> + </data> + <data name="MainPage_txtStatus.Text" xml:space="preserve"> + <value>Status:</value> + </data> + <data name="MCasAdmin" xml:space="preserve"> + <value>Launch minecraft as admin</value> + </data> + <data name="MCasAdminDescription" xml:space="preserve"> + <value>Do this at your own risk!</value> + </data> + <data name="MCBedrock" xml:space="preserve"> + <value>Minecraft for Windows</value> + </data> + <data name="MCDungeons" xml:space="preserve"> + <value>Minecraft Dungeons</value> + </data> + <data name="MCJava" xml:space="preserve"> + <value>Minecraft: Java Edition</value> + </data> + <data name="MCLegends" xml:space="preserve"> + <value>Minecraft Legends</value> + </data> + <data name="MCPathFailed" xml:space="preserve"> + <value>Failed to initialize Minecraft path at `{Path}`. Do you want to try again?</value> + </data> + <data name="MCWindowsSize" xml:space="preserve"> + <value>Minecraft Windows Size</value> + </data> + <data name="MCWindowsSizeDescription" xml:space="preserve"> + <value>Change width, height or full screen</value> + </data> + <data name="MergeAccount" xml:space="preserve"> + <value>Merge Account</value> + </data> + <data name="MergeMsAcExistingWithNew" xml:space="preserve"> + <value>{Count} Microsoft account with same UUID already exist(s) in the accounts. Do you want to merge them together?</value> + </data> + <data name="MicaType" xml:space="preserve"> + <value>Mica Type</value> + </data> + <data name="MicaTypeDescription" xml:space="preserve"> + <value>Normal Mica or Mica Alt (Tabbed)</value> + </data> + <data name="MicrosoftAccount" xml:space="preserve"> + <value>Microsoft Account</value> + </data> + <data name="MicrosoftOrOffline" xml:space="preserve"> + <value>Microsoft or offline</value> + </data> + <data name="MinecraftPath" xml:space="preserve"> + <value>Minecraft Path</value> + </data> + <data name="MinecraftPathDescription" xml:space="preserve"> + <value>The path of the minecraft client</value> + </data> + <data name="MinecraftSettings" xml:space="preserve"> + <value>Minecraft Settings</value> + </data> + <data name="ModsNoInternet" xml:space="preserve"> + <value>Cannot find mods with follwing name or you may got disconnected from the internet.</value> + </data> + <data name="More" xml:space="preserve"> + <value>More</value> + </data> + <data name="MoreVerInfo" xml:space="preserve"> + <value>More version info</value> + </data> + <data name="NavIconStyle" xml:space="preserve"> + <value>Navigation Buttons Icon Style</value> + </data> + <data name="NavIconStyleDescription" xml:space="preserve"> + <value>Select a beautiful icons set for your sidebar</value> + </data> + <data name="NewAccount" xml:space="preserve"> + <value>New Account</value> + </data> + <data name="NewHere" xml:space="preserve"> + <value>Looks like you are new here. Shall we go on a quick check out?</value> + </data> + <data name="News" xml:space="preserve"> + <value>News</value> + </data> + <data name="NewsNoInternet" xml:space="preserve"> + <value>Cannot find news with follwing title or you may got disconnected from the internet.</value> + </data> + <data name="NoColor" xml:space="preserve"> + <value>No color</value> + </data> + <data name="NoMsixUpdate" xml:space="preserve"> + <value>Failed to find the installer package in the release for this architecture</value> + </data> + <data name="NoNetwork" xml:space="preserve"> + <value>Seems like you don't have good internet...</value> + </data> + <data name="NoThanks" xml:space="preserve"> + <value>No Thanks</value> + </data> + <data name="NoUpdates" xml:space="preserve"> + <value>You are on the latest version</value> + </data> + <data name="NoUpdatesAvailable" xml:space="preserve"> + <value>No Updates Available</value> + </data> + <data name="OfflineAccount" xml:space="preserve"> + <value>Offline account</value> + </data> + <data name="OfflineMode" xml:space="preserve"> + <value>Offline Mode</value> + </data> + <data name="Options" xml:space="preserve"> + <value>Options</value> + </data> + <data name="PickVer" xml:space="preserve"> + <value>Pick a Version</value> + </data> + <data name="RAM" xml:space="preserve"> + <value>Memory</value> + </data> + <data name="RAMDescription" xml:space="preserve"> + <value>The allocated memory of the minecraft client</value> + </data> + <data name="RamFailed" xml:space="preserve"> + <value>Failed to get the RAM of the device.</value> + <comment>Rarely Used</comment> + </data> + <data name="Ready" xml:space="preserve"> + <value>Ready</value> + </data> + <data name="RefreshVerFailed" xml:space="preserve"> + <value>Failed to get the Minecraft versions</value> + </data> + <data name="RefreshVers" xml:space="preserve"> + <value>Refresh Versions</value> + </data> + <data name="release" xml:space="preserve"> + <value>Release</value> + </data> + <data name="ReleaseNotes" xml:space="preserve"> + <value>Release notes</value> + </data> + <data name="Remove" xml:space="preserve"> + <value>Remove</value> + </data> + <data name="Retry" xml:space="preserve"> + <value>Retry</value> + </data> + <data name="Save" xml:space="preserve"> + <value>Save</value> + </data> + <data name="Search" xml:space="preserve"> + <value>Search</value> + </data> + <data name="SearchingStore" xml:space="preserve"> + <value>Searching Store</value> + </data> + <data name="SearchStore" xml:space="preserve"> + <value>Search Store</value> + </data> + <data name="Select" xml:space="preserve"> + <value>Select</value> + </data> + <data name="SelectAll" xml:space="preserve"> + <value>Select All</value> + </data> + <data name="SelectNone" xml:space="preserve"> + <value>Select None</value> + </data> + <data name="SetDifMCPath" xml:space="preserve"> + <value>Change Path</value> + </data> + <data name="Settings" xml:space="preserve"> + <value>Settings</value> + </data> + <data name="SettingsBackups" xml:space="preserve"> + <value>Settings Backups</value> + </data> + <data name="SettingsBackupsDescription" xml:space="preserve"> + <value>Create, delete, view and try to load backups of your settings</value> + </data> + <data name="SettingsLoadWarn" xml:space="preserve"> + <value>This will overwrite the current settings and restart the application. If the application failed to load the settings, the previous settings will be lost. Do you want to create a backup of this settings before load?</value> + </data> + <data name="SettingsPage_txtSettings.Text" xml:space="preserve"> + <value>Settings</value> + </data> + <data name="SignInWithMS" xml:space="preserve"> + <value>Sign-in with Microsoft</value> + </data> + <data name="Store" xml:space="preserve"> + <value>Store</value> + </data> + <data name="Sure" xml:space="preserve"> + <value>Sure!</value> + </data> + <data name="SwitchOffline" xml:space="preserve"> + <value>Switch to offline mode</value> + </data> + <data name="SystemDefault" xml:space="preserve"> + <value>System Default</value> + </data> + <data name="TaskIntro" xml:space="preserve"> + <value>If you clear a running task, it won't get stopped. It'll run in the background without showing a progress.</value> + </data> + <data name="Tasks" xml:space="preserve"> + <value>Tasks</value> + </data> + <data name="ThatsIt" xml:space="preserve"> + <value>That's it! Go to settings for more options</value> + </data> + <data name="TimeLeft" xml:space="preserve"> + <value>{Time} left</value> + </data> + <data name="TryLoad" xml:space="preserve"> + <value>Try to load</value> + </data> + <data name="TypeCustom" xml:space="preserve"> + <value>Local</value> + </data> + <data name="TypeOldAlpha" xml:space="preserve"> + <value>OldAlpha</value> + </data> + <data name="TypeOldBeta" xml:space="preserve"> + <value>OldBeta</value> + </data> + <data name="TypeRelease" xml:space="preserve"> + <value>Release</value> + </data> + <data name="TypeSnapshot" xml:space="preserve"> + <value>Snapshot</value> + </data> + <data name="UnexpectedRestart" xml:space="preserve"> + <value>Some unexpected thing happend. Please restart the app!</value> + </data> + <data name="UpdateAvailable" xml:space="preserve"> + <value>Update Available</value> + </data> + <data name="UpdateNow" xml:space="preserve"> + <value>Update now</value> + </data> + <data name="Updates" xml:space="preserve"> + <value>Updates</value> + </data> + <data name="UpdatesDescription" xml:space="preserve"> + <value>Auto update, include prerelease etc..</value> + </data> + <data name="Username" xml:space="preserve"> + <value>Username</value> + </data> + <data name="UsingBrowser" xml:space="preserve"> + <value>Using the default browser</value> + </data> + <data name="UUID" xml:space="preserve"> + <value>UUID</value> + </data> + <data name="VaniilaOrFabric" xml:space="preserve"> + <value>Fabric and Vanilla is officially supported</value> + </data> + <data name="Version" xml:space="preserve"> + <value>Version</value> + </data> + <data name="View" xml:space="preserve"> + <value>View</value> + </data> + <data name="Warning" xml:space="preserve"> + <value>Warning</value> + </data> + <data name="Welcome" xml:space="preserve"> + <value>Welcome!</value> + <comment>Rarely Used</comment> + </data> + <data name="Whoops" xml:space="preserve"> + <value>Whoops!</value> + </data> + <data name="Width" xml:space="preserve"> + <value>Screen Width</value> + </data> + <data name="Win32Error" xml:space="preserve"> + <value>It seems your java setting has problem</value> + <comment>Rarely Used</comment> + </data> + <data name="WindowsHello" xml:space="preserve"> + <value>Windows Hello</value> + </data> + <data name="WindowsHelloDescription" xml:space="preserve"> + <value>Do not create, view, load, delete backups without Windows Hello authentication</value> + </data> + <data name="WindowTintColor" xml:space="preserve"> + <value>Window tint color</value> + </data> + <data name="WindowTintColorDescription" xml:space="preserve"> + <value>Show a color overlay behind the app content</value> + </data> + <data name="WinHelloChangeFailed" xml:space="preserve"> + <value>Unable to change the setting because you failed to authenticate with Windows Hello</value> + </data> + <data name="WrongRAM" xml:space="preserve"> + <value>Invalid RAM</value> + <comment>Rarely Used</comment> + </data> +</root> \ No newline at end of file