Skip to content

Commit c565244

Browse files
michaeljolleymichaeljolley
committed
Cleaning up extensions
1 parent 10551bc commit c565244

14 files changed

Lines changed: 535 additions & 22 deletions

‎src/CmdPalRandomDadJokeExtension/CmdPalRandomDadJokeExtension.csproj‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,21 @@
3939
<PackageReference Include="Microsoft.Web.WebView2" />
4040
</ItemGroup>
4141

42+
<ItemGroup>
43+
<Compile Update="Properties\Resources.Designer.cs">
44+
<DesignTime>True</DesignTime>
45+
<AutoGen>True</AutoGen>
46+
<DependentUpon>Resources.resx</DependentUpon>
47+
</Compile>
48+
</ItemGroup>
49+
50+
<ItemGroup>
51+
<EmbeddedResource Update="Properties\Resources.resx">
52+
<Generator>ResXFileCodeGenerator</Generator>
53+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
54+
</EmbeddedResource>
55+
</ItemGroup>
56+
4257
<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
4358
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
4459
</PropertyGroup>

‎src/CmdPalRandomDadJokeExtension/CmdPalRandomDadJokeExtensionCommandsProvider.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
using Microsoft.CommandPalette.Extensions;
22
using Microsoft.CommandPalette.Extensions.Toolkit;
3+
using CmdPalRandomDadJokeExtension.Properties;
34

45
namespace CmdPalRandomDadJokeExtension;
56

67
public partial class CmdPalRandomDadJokeExtensionCommandsProvider : CommandProvider
78
{
8-
private readonly CommandItem jokeCommandItem = new(new DadJokePage());
9+
private readonly DadJokePage dadJokePage = new();
910

1011
public CmdPalRandomDadJokeExtensionCommandsProvider()
1112
{
12-
DisplayName = "Random Dad Joke";
13-
Icon = IconHelpers.FromRelativePath("Assets\\Square88x88Logo.png");
13+
DisplayName = Resources.extension_name;
14+
Icon = Icons.DadJokeIcon;
1415
Id = "com.baldbeardedbuilder.cmdpal.randomdadjoke";
1516
}
1617

17-
public override ICommandItem[] TopLevelCommands() => [jokeCommandItem];
18+
public override ICommandItem[] TopLevelCommands() => [dadJokePage.ToCommandItem()];
1819
}

‎src/CmdPalRandomDadJokeExtension/DadJokePage.cs‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
using System.Net.Http.Headers;
44
using System.Text.Json;
55
using System.Threading.Tasks;
6-
76
using Microsoft.CommandPalette.Extensions;
87
using Microsoft.CommandPalette.Extensions.Toolkit;
8+
using CmdPalRandomDadJokeExtension.Properties;
9+
using System.Diagnostics;
910

1011
namespace CmdPalRandomDadJokeExtension;
1112

@@ -22,8 +23,8 @@ internal sealed partial class DadJokePage : ContentPage
2223

2324
public DadJokePage()
2425
{
25-
Name = "Random Dad Joke";
26-
Icon = IconHelpers.FromRelativePath("Assets\\Square88x88Logo.png");
26+
Name = Resources.extension_name;
27+
Icon = Icons.DadJokeIcon;
2728
Id = "com.baldbeardedbuilder.cmdpal.randomdadjoke";
2829
_markdownContent = new MarkdownContent();
2930

@@ -74,7 +75,7 @@ public void RefreshJoke()
7475
private void HandleRefresh(object sender, object? args)
7576
{
7677
RefreshJoke();
77-
RaiseItemsChanged(0);
78+
RaiseItemsChanged();
7879
}
7980

8081
private static async Task<string?> GetJokeAsync()
@@ -97,7 +98,7 @@ private void HandleRefresh(object sender, object? args)
9798
}
9899
catch (Exception e)
99100
{
100-
Console.WriteLine($"An error occurred: {e.Message}");
101+
Debug.WriteLine($"An error occurred: {e.Message}");
101102
}
102103

103104
return string.Empty;
@@ -111,4 +112,14 @@ private static string GenerateMarkdown(string content)
111112
112113
";
113114
}
115+
116+
public CommandItem ToCommandItem()
117+
{
118+
return new(this)
119+
{
120+
Title = Name,
121+
Icon = Icon,
122+
Subtitle = Resources.extension_subtitle,
123+
};
124+
}
114125
}

‎src/CmdPalRandomDadJokeExtension/Icons.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using Microsoft.CommandPalette.Extensions.Toolkit;
2+
3+
namespace CmdPalRandomDadJokeExtension;
4+
5+
internal static class Icons
6+
{
7+
internal static IconInfo DadJokeIcon { get; } = IconHelpers.FromRelativePath("Assets\\Square88x88Logo.png");
8+
9+
internal static IconInfo RefreshIcon { get; } = new("\uE72C");
10+
}

‎src/CmdPalRandomDadJokeExtension/Properties/Resources.Designer.cs‎

Lines changed: 90 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/CmdPalRandomDadJokeExtension/Properties/Resources.resx‎

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="extension subtitle" xml:space="preserve">
121+
<value>Brighten your day with a random joke</value>
122+
</data>
123+
<data name="extension_command_refresh" xml:space="preserve">
124+
<value>Refresh</value>
125+
</data>
126+
<data name="extension_name" xml:space="preserve">
127+
<value>Random Dad Joke</value>
128+
</data>
129+
</root>

‎src/CmdPalRandomDadJokeExtension/RefreshCommand.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.CommandPalette.Extensions;
1+
using CmdPalRandomDadJokeExtension.Properties;
2+
using Microsoft.CommandPalette.Extensions;
23
using Microsoft.CommandPalette.Extensions.Toolkit;
34
using Windows.Foundation;
45

@@ -10,8 +11,8 @@ internal sealed partial class RefreshCommand : InvokableCommand
1011

1112
public RefreshCommand()
1213
{
13-
Icon = new("\uE72C");
14-
Name = "Refresh";
14+
Icon = Icons.RefreshIcon;
15+
Name = Resources.extension_command_refresh;
1516
Id = "com.baldbeardedbuilder.cmdpal.randomdadjoke.refresh";
1617
}
1718

‎src/CmdPalRandomFactsExtension/CmdPalRandomFactsExtension.csproj‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,21 @@
4040
<PackageReference Include="Microsoft.Web.WebView2" />
4141
</ItemGroup>
4242

43+
<ItemGroup>
44+
<Compile Update="Properties\Resources.Designer.cs">
45+
<DesignTime>True</DesignTime>
46+
<AutoGen>True</AutoGen>
47+
<DependentUpon>Resources.resx</DependentUpon>
48+
</Compile>
49+
</ItemGroup>
50+
51+
<ItemGroup>
52+
<EmbeddedResource Update="Properties\Resources.resx">
53+
<Generator>ResXFileCodeGenerator</Generator>
54+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
55+
</EmbeddedResource>
56+
</ItemGroup>
57+
4358
<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
4459
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
4560
</PropertyGroup>

‎src/CmdPalRandomFactsExtension/CmdPalRandomFactsExtensionCommandsProvider.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
using Microsoft.CommandPalette.Extensions;
1+
using CmdPalRandomFactsExtension.Properties;
2+
using Microsoft.CommandPalette.Extensions;
23
using Microsoft.CommandPalette.Extensions.Toolkit;
34

45
namespace CmdPalRandomFactsExtension;
56

67
public partial class CmdPalRandomFactsExtensionCommandsProvider : CommandProvider
78
{
8-
private readonly CommandItem factCommandItem = new(new FactsPage());
9+
private readonly FactsPage factsPage = new();
910

1011
public CmdPalRandomFactsExtensionCommandsProvider()
1112
{
12-
DisplayName = "Random Facts";
13-
Icon = IconHelpers.FromRelativePath("Assets\\Square88x88Logo.png");
13+
DisplayName = Resources.extension_name;
14+
Icon = Icons.FactsIcon;
1415
Id = "com.baldbeardedbuilder.cmdpal.randomfacts";
1516
}
1617

17-
public override ICommandItem[] TopLevelCommands() => [factCommandItem];
18+
public override ICommandItem[] TopLevelCommands() => [factsPage.ToCommandItem()];
1819
}

0 commit comments

Comments
 (0)