Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 10.0.x
- name: Restore dependencies
run: dotnet restore "${{ env.WORKING_DIRECTORY }}"
- name: Build
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
run: |
mkdir -p "${{ env.OUTPUT_PATH_MAC }}/Stardrop.app/Contents/MacOS"
mkdir -p "${{ env.OUTPUT_PATH_MAC }}/Stardrop.app/Contents/Resources"
dotnet publish "${{ env.WORKING_DIRECTORY }}" --output "${{ env.OUTPUT_PATH_MAC }}/Stardrop.app/Contents/MacOS" --configuration "${{ env.CONFIGURATION }}" --runtime "osx-arm64" --framework "net8.0" --self-contained
dotnet publish "${{ env.WORKING_DIRECTORY }}/Stardrop.csproj" --output "${{ env.OUTPUT_PATH_MAC }}/Stardrop.app/Contents/MacOS" --configuration "${{ env.CONFIGURATION }}" --runtime "osx-arm64" --framework "net10.0" --self-contained
- name: Publish (MacOS - Packaging)
working-directory: "${{ env.OUTPUT_PATH_MAC }}/Stardrop.app"
run: |
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
run: |
mkdir -p "${{ env.OUTPUT_PATH_MAC }}/Stardrop.app/Contents/MacOS"
mkdir -p "${{ env.OUTPUT_PATH_MAC }}/Stardrop.app/Contents/Resources"
dotnet publish "${{ env.WORKING_DIRECTORY }}" --output "${{ env.OUTPUT_PATH_MAC }}/Stardrop.app/Contents/MacOS" --configuration "${{ env.CONFIGURATION }}" --runtime "osx-x64" --framework "net8.0" --self-contained
dotnet publish "${{ env.WORKING_DIRECTORY }}/Stardrop.csproj" --output "${{ env.OUTPUT_PATH_MAC }}/Stardrop.app/Contents/MacOS" --configuration "${{ env.CONFIGURATION }}" --runtime "osx-x64" --framework "net10.0" --self-contained
- name: Publish (MacOS - Packaging)
working-directory: "${{ env.OUTPUT_PATH_MAC }}/Stardrop.app"
run: |
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
- run: mkdir -p path/to/release-artifacts
- name: Publish (Linux - Creating)
run: |
dotnet publish "${{ env.WORKING_DIRECTORY }}" --output "${{ env.OUTPUT_PATH_LINUX }}/Stardrop" --configuration "${{ env.CONFIGURATION }}" --runtime "linux-arm64" --framework "net8.0" --self-contained
dotnet publish "${{ env.WORKING_DIRECTORY }}/Stardrop.csproj" --output "${{ env.OUTPUT_PATH_LINUX }}/Stardrop" --configuration "${{ env.CONFIGURATION }}" --runtime "linux-arm64" --framework "net10.0" --self-contained
- name: Publish (Linux - Packaging)
working-directory: "${{ env.OUTPUT_PATH_LINUX }}/Stardrop"
run: |
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
- run: mkdir -p path/to/release-artifacts
- name: Publish (Linux - Creating)
run: |
dotnet publish "${{ env.WORKING_DIRECTORY }}" --output "${{ env.OUTPUT_PATH_LINUX }}/Stardrop" --configuration "${{ env.CONFIGURATION }}" --runtime "linux-x64" --framework "net8.0" --self-contained
dotnet publish "${{ env.WORKING_DIRECTORY }}/Stardrop.csproj" --output "${{ env.OUTPUT_PATH_LINUX }}/Stardrop" --configuration "${{ env.CONFIGURATION }}" --runtime "linux-x64" --framework "net10.0" --self-contained
- name: Publish (Linux - Packaging)
working-directory: "${{ env.OUTPUT_PATH_LINUX }}/Stardrop"
run: |
Expand All @@ -161,7 +161,7 @@ jobs:
Stardrop-linux-x64.zip
package-windows-arm64:
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'generate packages')
runs-on: ubuntu-latest
runs-on: windows-latest

steps:
- uses: actions/checkout@v4
Expand All @@ -171,7 +171,7 @@ jobs:
- run: mkdir -p path/to/release-artifacts
- name: Publish (Windows - Creating & Packaging)
run: |
dotnet publish "${{ env.WORKING_DIRECTORY }}" --output "${{ env.OUTPUT_PATH_WINDOWS }}/Stardrop" --configuration "${{ env.CONFIGURATION }}" --runtime "win-arm64" --framework "net8.0" --self-contained
dotnet publish "${{ env.WORKING_DIRECTORY }}/Stardrop.csproj" --output "${{ env.OUTPUT_PATH_WINDOWS }}/Stardrop" --configuration "${{ env.CONFIGURATION }}" --runtime "win-arm64" --framework "net10.0" --self-contained
(cd "${{ env.OUTPUT_PATH_WINDOWS }}" && zip -r ${GITHUB_WORKSPACE}/Stardrop-win-arm64.zip "Stardrop")
- name: Upload artifacts
uses: actions/upload-artifact@v4
Expand All @@ -181,7 +181,7 @@ jobs:
Stardrop-win-arm64.zip
package-windows-x64:
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'generate packages')
runs-on: ubuntu-latest
runs-on: windows-latest

steps:
- uses: actions/checkout@v4
Expand All @@ -191,7 +191,7 @@ jobs:
- run: mkdir -p path/to/release-artifacts
- name: Publish (Windows - Creating & Packaging)
run: |
dotnet publish "${{ env.WORKING_DIRECTORY }}" --output "${{ env.OUTPUT_PATH_WINDOWS }}/Stardrop" --configuration "${{ env.CONFIGURATION }}" --runtime "win-x64" --framework "net8.0" --self-contained
dotnet publish "${{ env.WORKING_DIRECTORY }}/Stardrop.csproj" --output "${{ env.OUTPUT_PATH_WINDOWS }}/Stardrop" --configuration "${{ env.CONFIGURATION }}" --runtime "win-x64" --framework "net10.0" --self-contained
(cd "${{ env.OUTPUT_PATH_WINDOWS }}" && zip -r ${GITHUB_WORKSPACE}/Stardrop-win-x64.zip "Stardrop")
- name: Upload artifacts
uses: actions/upload-artifact@v4
Expand Down
6 changes: 4 additions & 2 deletions Stardrop/App.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Stardrop"
x:Class="Stardrop.App"
Name="Stardrop">
Name="Stardrop"
RequestedThemeVariant="Light"
>
<Application.DataTemplates>
<local:ViewLocator/>
</Application.DataTemplates>

<Application.Styles>
<FluentTheme Mode="Light" />
<FluentTheme />
<StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
</Application.Styles>
</Application>
68 changes: 54 additions & 14 deletions Stardrop/App.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Stardrop.Utilities.Internal;
using Stardrop.Views;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;

Expand All @@ -23,33 +22,67 @@ public override void Initialize()
if (Program.helper is null)
{
Program.helper = new Helper();
Program.translation.LoadTranslations();
}

// Load in translations
Program.translation.LoadTranslations();

// Handle adding the themes
Dictionary<string, IStyle> themes = new Dictionary<string, IStyle>();
foreach (string fileFullName in ThemeManager.GetThemeFilePaths())
// Dictionary<string, IStyle> themes = [];
// foreach (string fileFullName in ThemeManager.GetThemeFilePaths())
// {
// try
// {
// var themeName = Path.GetFileNameWithoutExtension(fileFullName);
// themes[themeName] = ThemeManager.Load(fileFullName);
// Program.helper.Log($"Loaded theme {Path.GetFileNameWithoutExtension(fileFullName)}", Helper.Status.Debug);
// }
// catch (Exception ex)
// {
// Program.helper.Log($"Unable to load theme on {Path.GetFileNameWithoutExtension(fileFullName)}: {ex}", Helper.Status.Warning);
// }
// }

// Styles.Insert(ThemeManager.THEME_STYLE_INDEX, !themes.TryGetValue(Program.settings.Theme, out IStyle? value) ? themes.Values.First() : value);
var themeFilePaths = ThemeManager.GetThemeFilePaths().ToList();
string? targetThemePath = null;

foreach (var fileFullName in themeFilePaths)
{
var themeName = Path.GetFileNameWithoutExtension(fileFullName);
if (themeName.Equals(Program.settings.Theme, StringComparison.OrdinalIgnoreCase))
{
targetThemePath = fileFullName;
break;
}
}

if (targetThemePath is null && themeFilePaths.Count > 0)
{
targetThemePath = themeFilePaths.First();
Program.helper.Log($"Theme '{Program.settings.Theme}' not found, falling back to '{Path.GetFileNameWithoutExtension(targetThemePath)}'", Helper.Status.Warning);
}

if (targetThemePath is not null)
{
try
{
var themeName = Path.GetFileNameWithoutExtension(fileFullName);
themes[themeName] = ThemeManager.Load(fileFullName);
Program.helper.Log($"Loaded theme {Path.GetFileNameWithoutExtension(fileFullName)}", Helper.Status.Debug);
var selectedThemeStyle = ThemeManager.Load(targetThemePath);
Styles.Insert(ThemeManager.THEME_STYLE_INDEX, selectedThemeStyle);
Program.helper.Log($"Loaded theme {Path.GetFileNameWithoutExtension(targetThemePath)}", Helper.Status.Debug);
}
catch (Exception ex)
{
Program.helper.Log($"Unable to load theme on {Path.GetFileNameWithoutExtension(fileFullName)}: {ex}", Helper.Status.Warning);
Program.helper.Log($"Unable to load theme {Path.GetFileNameWithoutExtension(targetThemePath)}: {ex}", Helper.Status.Warning);
}
}

Current.Styles.Insert(ThemeManager.THEME_STYLE_INDEX, !themes.ContainsKey(Program.settings.Theme) ? themes.Values.First() : themes[Program.settings.Theme]);
#if DEBUG
this.AttachDeveloperTools();
#endif
}

private async void OnUrlsOpen(object? sender, UrlOpenedEventArgs e, MainWindow mainWindow)
private static async void OnUrlsOpen(object? sender, UrlOpenedEventArgs e, MainWindow mainWindow)
{
foreach (string? url in e.Urls.Where(u => String.IsNullOrEmpty(u) is false))
foreach (string? url in e.Urls.Where(u => string.IsNullOrEmpty(u) is false))
{
await mainWindow.ProcessNXMLink(new NXM() { Link = url, Timestamp = DateTime.Now });
}
Expand All @@ -63,7 +96,14 @@ public override void OnFrameworkInitializationCompleted()
desktop.MainWindow = mainWindow;

// Register events
this.UrlsOpened += (sender, e) => OnUrlsOpen(sender, e, mainWindow);
if (Current?.TryGetFeature<IActivatableLifetime>() is { } activatable)
{
activatable.Activated += (sender, args) =>
{
if (args is ProtocolActivatedEventArgs p)
OnUrlsOpen(sender, new UrlOpenedEventArgs([p.Uri.ToString()]), mainWindow);
};
}
}

base.OnFrameworkInitializationCompleted();
Expand Down
10 changes: 7 additions & 3 deletions Stardrop/Converters/EnumConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@ namespace Stardrop.Converters
{
public class EnumConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
{
return Enum.GetName((value.GetType()), value);
if (value is null)
{
return null;
}
return Enum.GetName(value.GetType(), value);
}

public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
Expand Down
2 changes: 1 addition & 1 deletion Stardrop/Converters/EnumEqualsConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class EnumEqualsConverter : IValueConverter
throw new ArgumentOutOfRangeException(nameof(parameter), "Parameter must be a non-null enum.");
}

return Enum.Equals(value, parameter);
return Equals(value, parameter);
}

public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
Expand Down
6 changes: 3 additions & 3 deletions Stardrop/Models/Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ namespace Stardrop.Models
{
public class Config
{
public string UniqueId { get; set; }
public string FilePath { get; set; }
public string UniqueId { get; set; } = null!;
public string FilePath { get; set; } = null!;
public DateTime LastWriteTimeUtc { get; set; }
public string Data { get; set; }
public string Data { get; set; } = null!;
}
}
10 changes: 5 additions & 5 deletions Stardrop/Models/Data/ClientData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ namespace Stardrop.Models.Data
{
public class ClientData
{
public List<ModInstallData> ModInstallData { get; set; }
public Dictionary<string, bool> ColumnActiveStates { get; set; } = new Dictionary<string, bool>();
public Dictionary<string, int> ColumnOrder { get; set; } = new Dictionary<string, int>();
public LastSessionData LastSessionData { get; set; }
public List<ModInstallData>? ModInstallData { get; set; }
public Dictionary<string, bool> ColumnActiveStates { get; set; } = [];
public Dictionary<string, int> ColumnOrder { get; set; } = [];
public LastSessionData? LastSessionData { get; set; }

// Mapping of mod unique id to the ignored suggested version string
public Dictionary<string, string> IgnoredUpdates { get; set; } = new Dictionary<string, string>();
public Dictionary<string, string> IgnoredUpdates { get; set; } = [];
}
}
Loading
Loading