Merge pull request #20 from hlaueriksson/Fyra

Fyra
hlaueriksson · Dec 26, 2022 · ed43c13 · ed43c13
2 parents c7ddef7 + 5bd311b
commit ed43c13
Show file tree

Hide file tree

Showing 24 changed files with 481 additions and 351 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,11 +12,13 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+    - uses: actions/checkout@v3
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          6.0.x
+          7.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

diff --git a/Analyzers.props b/Analyzers.props
@@ -20,7 +20,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.406">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/GEmojiSharp.Blazor/GEmojiSharp.Blazor.csproj b/src/GEmojiSharp.Blazor/GEmojiSharp.Blazor.csproj
@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.12" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/GEmojiSharp.DotnetTool/GEmojiSharp.DotnetTool.csproj b/src/GEmojiSharp.DotnetTool/GEmojiSharp.DotnetTool.csproj
@@ -41,11 +41,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
-    <PackageReference Include="TextCopy" Version="6.1.0" />
-    <PackageReference Include="Tomlyn" Version="0.14.1" />
-    <PackageReference Include="YamlDotNet" Version="11.2.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageReference Include="TextCopy" Version="6.2.1" />
+    <PackageReference Include="Tomlyn" Version="0.16.2" />
+    <PackageReference Include="YamlDotNet" Version="12.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/GEmojiSharp.DotnetTool/Program.cs b/src/GEmojiSharp.DotnetTool/Program.cs
@@ -10,26 +10,40 @@
 var copyOption = new Option<bool>(new[] { "-c", "--copy" }, "Copy to clipboard");
 
 // raw
+var skinTonesOption = new Option<bool>(new[] { "-st", "--skin-tones" }, "Include skin tone variants");
+
 var rawCommand = new Command("raw", "Get raw emojis")
 {
     argument,
+    skinTonesOption,
     copyOption,
 };
 
 rawCommand.AddAlias("r");
 
 rawCommand.SetHandler(
-    (string[] args, bool copy) =>
+    (string[] args, bool skinTones, bool copy) =>
     {
         var value = string.Join(" ", args);
         var emojis = Emoji.Find(value);
 
         foreach (var e in emojis)
+        {
             Console.WriteLine(e.Raw);
+            if (skinTones && e.HasSkinTones)
+            {
+                foreach (var tone in e.RawSkinToneVariants())
+                {
+                    Console.WriteLine(tone);
+                }
+            }
+        }
+
         if (copy)
-            ClipboardService.SetText(string.Join(string.Empty, emojis.Select(x => x.Raw)));
+            ClipboardService.SetText(string.Join(string.Empty, emojis.Select(e => skinTones && e.HasSkinTones ? e.Raw + string.Join(string.Empty, e.RawSkinToneVariants()) : e.Raw)));
     },
     argument,
+    skinTonesOption,
     copyOption);
 
 // alias

diff --git a/src/GEmojiSharp.PowerToysRun/GEmojiSharp.PowerToysRun.csproj b/src/GEmojiSharp.PowerToysRun/GEmojiSharp.PowerToysRun.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <UseWPF>true</UseWPF>
     <Platforms>x64</Platforms>
@@ -50,7 +50,11 @@
     <PackageReference Include="ilmerge" Version="3.0.41" />
   </ItemGroup>
   <Target Name="ILMerge">
-    <Exec Command="$(ILMergeConsolePath) /out:bin\Release\net6.0-windows\GEmojiSharp.PowerToysRun.dll bin\Release\net6.0-windows\GEmojiSharp.PowerToysRun.dll bin\Release\net6.0-windows\GEmojiSharp.dll /lib:&quot;C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\6.0.3\ref\net6.0&quot;" />
+    <Exec Command="$(ILMergeConsolePath) ^
+          /out:bin\Release\net7.0-windows\GEmojiSharp.PowerToysRun.dll ^
+          bin\Release\net7.0-windows\GEmojiSharp.PowerToysRun.dll ^
+          bin\Release\net7.0-windows\GEmojiSharp.dll ^
+          /lib:&quot;C:\Program Files\dotnet\packs\Microsoft.WindowsDesktop.App.Ref\7.0.1\ref\net7.0&quot;" />
   </Target>
 
 </Project>
diff --git a/src/GEmojiSharp.PowerToysRun/Main.cs b/src/GEmojiSharp.PowerToysRun/Main.cs
@@ -46,7 +46,7 @@ public List<Result> Query(Query query)
                 return Emoji.All.Select(GetResult).ToList();
             }
 
-            var emojis = Emoji.Find(value);
+            var emojis = (GEmoji[])Emoji.Find(value);
 
             if (emojis.Any())
             {
@@ -97,7 +97,7 @@ public List<Result> Query(Query query)
                 IcoPath = IconPath,
                 Title = emoji.Raw,
                 SubTitle = string.Join(" ", emoji.Aliases.Select(x => x.PadAlias())),
-                ToolTipData = new ToolTipData("GEmoji", $"Description: {emoji.Description}\nCategory: {emoji.Category}\nTags: {string.Join(", ", emoji.Tags ?? Enumerable.Empty<string>())}\n"),
+                ToolTipData = new ToolTipData("GEmoji", $"Description: {emoji.Description}\nCategory: {emoji.Category}\nTags: {string.Join(", ", emoji.Tags ?? Enumerable.Empty<string>())}\nUnicodeVersion: {emoji.UnicodeVersion}\nHasSkinTones: {(emoji.HasSkinTones ? "Yes" : "No")}"),
                 Action = _ => CopyToClipboard(emoji.Raw),
                 ContextData = emoji,
             };
@@ -133,27 +133,49 @@ public List<ContextMenuResult> LoadContextMenus(Result selectedResult)
         {
             if (selectedResult?.ContextData is GEmoji emoji)
             {
-                return new List<ContextMenuResult>
+                var raw = new ContextMenuResult
                 {
-                    new ContextMenuResult
-                    {
-                        PluginName = Name,
-                        Title = "Copy raw emoji (Enter)",
-                        FontFamily = "Segoe MDL2 Assets",
-                        Glyph = "\xE8C8", // E8C8 => Symbol: Copy
-                        AcceleratorKey = Key.Enter,
-                        Action = _ => CopyToClipboard(emoji.Raw),
-                    },
-                    new ContextMenuResult
+                    PluginName = Name,
+                    Title = "Copy raw emoji (Enter)",
+                    FontFamily = "Segoe MDL2 Assets",
+                    Glyph = "\xE8C8", // E8C8 => Symbol: Copy
+                    /*AcceleratorKey = Key.Enter,*/
+                    Action = _ => CopyToClipboard(emoji.Raw),
+                };
+                var alias = new ContextMenuResult
+                {
+                    PluginName = Name,
+                    Title = "Copy emoji aliases (Ctrl+C)",
+                    FontFamily = "Segoe MDL2 Assets",
+                    Glyph = "\xF413", // F413 => Symbol: CopyTo
+                    AcceleratorKey = Key.C,
+                    AcceleratorModifiers = ModifierKeys.Control,
+                    Action = _ => CopyToClipboard(string.Join(string.Empty, emoji.Aliases.Select(x => x.PadAlias()))),
+                };
+
+                if (emoji.HasSkinTones)
+                {
+                    return new List<ContextMenuResult>
                     {
-                        PluginName = Name,
-                        Title = "Copy emoji aliases (Ctrl+C)",
-                        FontFamily = "Segoe MDL2 Assets",
-                        Glyph = "\xF413", // F413 => Symbol: CopyTo
-                        AcceleratorKey = Key.C,
-                        AcceleratorModifiers = ModifierKeys.Control,
-                        Action = _ => CopyToClipboard(string.Join(string.Empty, emoji.Aliases.Select(x => x.PadAlias()))),
-                    },
+                        raw,
+                        alias,
+                        new ContextMenuResult
+                        {
+                            PluginName = Name,
+                            Title = "Copy raw emoji skin tone variants (Ctrl+Enter)",
+                            FontFamily = "Segoe MDL2 Assets",
+                            Glyph = "\xE748", // E748 => Symbol: SwitchUser
+                            AcceleratorKey = Key.Enter,
+                            AcceleratorModifiers = ModifierKeys.Control,
+                            Action = _ => CopyToClipboard(emoji.Raw + string.Join(string.Empty, emoji.RawSkinToneVariants())),
+                        },
+                    };
+                }
+
+                return new List<ContextMenuResult>
+                {
+                    raw,
+                    alias,
                 };
             }
 
@@ -167,7 +189,7 @@ public List<ContextMenuResult> LoadContextMenus(Result selectedResult)
                         Title = "Copy emojified text (Enter)",
                         FontFamily = "Segoe MDL2 Assets",
                         Glyph = "\xE8C8", // E8C8 => Symbol: Copy
-                        AcceleratorKey = Key.Enter,
+                        /*AcceleratorKey = Key.Enter,*/
                         Action = _ => CopyToClipboard(emojified.Value),
                     },
                 };
@@ -183,7 +205,7 @@ public List<ContextMenuResult> LoadContextMenus(Result selectedResult)
                         Title = "Copy demojified text (Enter)",
                         FontFamily = "Segoe MDL2 Assets",
                         Glyph = "\xE8C8", // E8C8 => Symbol: Copy
-                        AcceleratorKey = Key.Enter,
+                        /*AcceleratorKey = Key.Enter,*/
                         Action = _ => CopyToClipboard(demojified.Value),
                     },
                 };

diff --git a/src/GEmojiSharp.PowerToysRun/deploy.bat b/src/GEmojiSharp.PowerToysRun/deploy.bat
@@ -0,0 +1,7 @@
+call pack.bat
+
+taskkill /f /im PowerToys.exe /t
+
+xcopy /s /y .\bin\Release\GEmojiSharp\ "C:\Program Files\PowerToys\modules\launcher\Plugins\GEmojiSharp\"
+
+start "" "C:\Program Files\PowerToys\PowerToys.exe"
diff --git a/src/GEmojiSharp.PowerToysRun/libs/PowerToys.Common.UI.dll b/src/GEmojiSharp.PowerToysRun/libs/PowerToys.Common.UI.dll
diff --git a/src/GEmojiSharp.PowerToysRun/libs/PowerToys.ManagedCommon.dll b/src/GEmojiSharp.PowerToysRun/libs/PowerToys.ManagedCommon.dll
diff --git a/src/GEmojiSharp.PowerToysRun/libs/Wox.Plugin.dll b/src/GEmojiSharp.PowerToysRun/libs/Wox.Plugin.dll
diff --git a/src/GEmojiSharp/Emoji.cs b/src/GEmojiSharp/Emoji.cs
@@ -39,7 +39,7 @@ public static GEmoji Get(string value)
         {
             if (value is null) throw new ArgumentNullException(nameof(value));
 
-            var key = value.TrimAlias();
+            var key = value.TrimAlias().TrimSkinToneVariants();
 
             return
                 AliasToGEmoji.ContainsKey(key) ? AliasToGEmoji[key] :