dan/Hyperbar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bunch ov fixes

Browse Source
This commit is contained in:
TheXamlGuy
2024-01-28 14:57:56 +00:00
parent 9f6cc35bc1
commit 6d40220412
28 changed files with 238 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Hyperbar.Widget.Windows/Hyperbar.Widget.Windows.csproj
-29
View File
@@ -7,13 +7,6 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<None Remove="WidgetBarView.xaml" />
<None Remove="WidgetButtonView.xaml" />
<None Remove="WidgetContainerView.xaml" />
<None Remove="WidgetSplitButtonView.xaml" />
<None Remove="WidgetView.xaml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.231202003-experimental1" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" />
@@ -25,26 +18,4 @@
<ProjectReference Include="..\Hyperbar.Widget\Hyperbar.Widget.csproj" />
<ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
</ItemGroup>
<ItemGroup>
<Page Update="WidgetBarView.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
<SubType>Designer</SubType>
</Page>
<Page Update="WidgetButtonView.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
<SubType>Designer</SubType>
</Page>
<Page Update="WidgetContainerView.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
<SubType>Designer</SubType>
</Page>
<Page Update="WidgetSplitButtonView.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
<SubType>Designer</SubType>
</Page>
<Page Update="WidgetView.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
</Project>
Hyperbar.Widget.Windows/WidgetResourceInitialization.cs
+15 -20
View File
@@ -1,5 +1,4 @@
using System.Reflection;
using Windows.ApplicationModel.Resources.Core;
using Windows.ApplicationModel.Resources.Core;
using Windows.Storage;
namespace Hyperbar.Widget.Windows;
@@ -9,27 +8,23 @@ internal class WidgetResourceInitialization(IWidgetAssembly widgetAssembly) :
{
public async Task InitializeAsync()
{
if (widgetAssembly.Assembly is Assembly assembly)
string assemblyDirectory = Path.GetDirectoryName(widgetAssembly.Assembly.Location) ?? string.Empty;
string[] possibleFileNames = ["resources.pri", $"{widgetAssembly.Assembly.GetName().Name}.pri"];
FileInfo? resourceFileInfo = null;
foreach (string fileName in possibleFileNames)
{
if (Path.GetDirectoryName(assembly.Location) is string assemblyDirectory)
resourceFileInfo = new FileInfo(Path.Combine(assemblyDirectory, fileName));
if (resourceFileInfo.Exists)
{
FileInfo resourceFileInfo = new(Path.Combine(assemblyDirectory,
"resources.pri"));
if (!resourceFileInfo.Exists)
{
resourceFileInfo = new(Path.Combine(assemblyDirectory,
$"{assembly.GetName().Name}.pri"));
}
if (!resourceFileInfo.Exists)
{
return;
}
StorageFile file = await StorageFile.GetFileFromPathAsync(resourceFileInfo.FullName);
ResourceManager.Current.LoadPriFiles(new[] { file });
break;
}
}
if (resourceFileInfo?.Exists is true)
{
StorageFile file = await StorageFile.GetFileFromPathAsync(resourceFileInfo.FullName);
ResourceManager.Current.LoadPriFiles(new[] { file });
}
}
}