Rename Emerald namsepace to Emerald.Uno + Some updates

RiversideValley · Oct 29, 2024 · ddb892d · ddb892d
1 parent 4a0fb60
commit ddb892d
Show file tree

Hide file tree

Showing 22 changed files with 745 additions and 77 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 using Uno.Resizetizer;
 
-namespace Emerald;
+namespace Emerald.Uno;
 public partial class App : Application
 {
     /// <summary>

diff --git a/Emerald/Emerald.csproj → Emerald/Emerald.Uno.csproj b/Emerald/Emerald.csproj → 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
@@ -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
@@ -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
@@ -0,0 +1,9 @@
+namespace Emerald.Uno.Helpers.Settings.Enums
+{
+    public enum MicaTintColor : int
+    {
+        NoColor = 0,
+        AccentColor = 1,
+        CustomColor = 2
+    }
+}