Skip to content

Commit 82b5a26

Browse files
meruunemeruune
committed
Tweaks
1 parent 7bb66c9 commit 82b5a26

366 files changed

Lines changed: 14942 additions & 99 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Amethyst.Contract/Amethyst.Contract.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<PackageReference Include="Avalonia" Version="11.3.2"/>
2727
<PackageReference Include="Avalonia.Labs.Controls" Version="11.3.1"/>
2828
<PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.2"/>
29-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
29+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
3030
<PackageReference Include="Splat" Version="16.2.1"/>
3131
</ItemGroup>
3232

‎Amethyst.Desktop/Amethyst.Desktop.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>net8.0</TargetFrameworks>
4-
<OutputType>WinExe</OutputType>
4+
<!-- <OutputType>WinExe</OutputType>-->
5+
<OutputType>Exe</OutputType>
56
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
67
<ApplicationManifest>app.manifest</ApplicationManifest>
78
<NoWarn>$(NoWarn);NU1507</NoWarn>

‎Amethyst/Amethyst.csproj‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,21 @@
1313

1414
<ItemGroup>
1515
<AvaloniaResource Include="Assets\**" />
16-
<AvaloniaResource Include="NiTE2\**" />
1716
</ItemGroup>
1817

18+
<ItemGroup>
19+
<Content Include="Resources\**" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest"
20+
Link="%(RecursiveDir)\%(Filename)%(Extension)" Visible="False" />
21+
</ItemGroup>
22+
1923
<ItemGroup>
20-
<Content Include="Assets\**">
24+
<Content Include="Strings\**">
2125
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
2226
</Content>
23-
<Content Include="NiTE2\**">
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<Content Include="Assets/Sounds\**">
2431
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
2532
</Content>
2633
</ItemGroup>
@@ -40,7 +47,7 @@
4047
<PackageReference Include="LibVLCSharp.Avalonia" Version="3.9.3"/>
4148
<PackageReference Include="Markdown.Avalonia" Version="11.0.3-a1"/>
4249
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0"/>
43-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
50+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
4451
<PackageReference Include="RestSharp" Version="112.1.0"/>
4552
<PackageReference Include="Splat" Version="16.2.1"/>
4653
<PackageReference Include="System.ComponentModel.Composition" Version="10.0.0-preview.5.25277.114"/>

‎Amethyst/App.axaml‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,9 @@
1313
<utils:OpacityHalfBoolConverter x:Key="BoolToOpacityHalfConverter" />
1414
<utils:OpacityHalfBoolInvertedConverter x:Key="BoolToOpacityHalfInvertedConverter" />
1515

16-
<ResourceDictionary.ThemeDictionaries>
17-
<ResourceDictionary x:Key="Light">
18-
<!-- <AcrylicBrush x:Key="CalibrationPaneBackgroundAcrylicBrush" -->
19-
<!-- TintOpacity="0.1" TintLuminosityOpacity="0.1" -->
20-
<!-- TintColor="#FF000000" FallbackColor="#20000000" /> -->
21-
22-
<SolidColorBrush x:Key="NoThemeColorSolidColorBrush" Color="White" />
23-
<SolidColorBrush x:Key="NoThemeColorSolidColorBrushOpposite" Color="Black" />
24-
<Thickness x:Key="ControlExampleDisplayBorderThickness">1</Thickness>
25-
</ResourceDictionary>
26-
<ResourceDictionary x:Key="Dark">
27-
<!-- <AcrylicBrush x:Key="CalibrationPaneBackgroundAcrylicBrush" -->
28-
<!-- TintOpacity="0.1" TintLuminosityOpacity="0.2" -->
29-
<!-- TintColor="#FF000000" FallbackColor="#33000000" /> -->
30-
31-
<SolidColorBrush x:Key="NoThemeColorSolidColorBrush" Color="Black" />
32-
<SolidColorBrush x:Key="NoThemeColorSolidColorBrushOpposite" Color="White" />
33-
<Thickness x:Key="ControlExampleDisplayBorderThickness">1</Thickness>
34-
</ResourceDictionary>
35-
</ResourceDictionary.ThemeDictionaries>
36-
3716
<GridLength x:Key="ContentDialogButtonSpacing">Auto</GridLength>
3817
<x:Double x:Key="ContentControlFontSize">15</x:Double>
39-
<Thickness x:Key="ControlExampleDisplayBorderThickness">0</Thickness>
18+
<Thickness x:Key="ControlExampleDisplayBorderThickness">1</Thickness>
4019
<CornerRadius x:Key="ControlCornerRadius">4</CornerRadius>
4120

4221
<fluent:SymbolIconSource Symbol="Home" x:Key="HomeIcon" />

‎Amethyst/App.axaml.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,13 @@ private async Task SetupCoreApplication()
153153
AppPlugins.PluginSettings.ReadSettings();
154154

155155
// Run detached to allow for async calls
156-
var stringsFolder = Path.Join(Interfacing.AppDirectoryName, "Assets", "Strings");
156+
var stringsFolder = Path.Join(Interfacing.AppDirectoryName, "Strings");
157157
if (File.Exists(Interfacing.GetAppDataFilePath("Localization.json")))
158158
try
159159
{
160160
// Parse the loaded json
161161
var defaults = JsonConvert.DeserializeObject<LocalizationSettings>(
162-
File.ReadAllText(Interfacing.GetAppDataFilePath("Localization.json"))) ??
162+
await File.ReadAllTextAsync(Interfacing.GetAppDataFilePath("Localization.json"))) ??
163163
new LocalizationSettings();
164164

165165
if (defaults.AmethystStringsFolder is not null &&
@@ -1042,23 +1042,23 @@ private async Task SetupLocalizationResources(bool overwrite = false)
10421042
var pluginStringsFolders = new SortedDictionary<string, string>();
10431043

10441044
// Copy all app and plugin strings to a shared folder
1045-
new DirectoryInfo(Path.Join(Interfacing.ProgramLocation.DirectoryName!, "Assets", "Strings"))
1045+
new DirectoryInfo(Path.Join(Interfacing.ProgramLocation.DirectoryName!, "Strings"))
10461046
.CopyToFolder(appStringsFolder!.Path.AbsolutePath, overwrite: overwrite);
10471047

10481048
var localPluginsFolder = Path.Combine(Interfacing.ProgramLocation.DirectoryName!, "Plugins");
10491049
if (Directory.Exists(localPluginsFolder))
10501050
foreach (var pluginFolder in Directory.EnumerateDirectories(
10511051
localPluginsFolder, "*", SearchOption.TopDirectoryOnly)
1052-
.Where(x => Directory.Exists(Path.Join(x, "Assets", "Strings"))).ToList())
1052+
.Where(x => Directory.Exists(Path.Join(x, "Strings"))).ToList())
10531053
{
10541054
// Copy to the shared folder, creating a random name
10551055
var outputFolder = await stringsFolder.CreateFolderAsync(
10561056
new DirectoryInfo(pluginFolder).Name);
10571057

1058-
new DirectoryInfo(Path.Join(pluginFolder, "Assets", "Strings"))
1058+
new DirectoryInfo(Path.Join(pluginFolder, "Strings"))
10591059
.CopyToFolder(outputFolder!.Path.AbsolutePath, overwrite: overwrite);
10601060

1061-
pluginStringsFolders.Add(Path.Join(pluginFolder, "Assets", "Strings"),
1061+
pluginStringsFolders.Add(Path.Join(pluginFolder, "Strings"),
10621062
outputFolder.Path.AbsolutePath);
10631063
}
10641064

‎Amethyst/Assets/Icons/AppWindowIcon.png‎

-4.04 KB
Binary file not shown.

‎Amethyst/Assets/Icons/BasicInputIcon.png‎

-5.85 KB
Binary file not shown.

‎Amethyst/Assets/Icons/BreadcrumbBarIcon.png‎

-7.03 KB
Binary file not shown.

‎Amethyst/Assets/Icons/ColorPickerButtonIcon.png‎

-6.92 KB
Binary file not shown.

‎Amethyst/Assets/Icons/ColorPickerIcon.png‎

-11.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)