From ec6cb0abb4b7669895b6e96fd7581c93b5abd691 Mon Sep 17 00:00:00 2001 From: Mary Guillemard Date: Sat, 2 Mar 2024 12:51:05 +0100 Subject: infra: Make Avalonia the default UI (#6375) * misc: Move Ryujinx project to Ryujinx.Gtk3 This breaks release CI for now but that's fine. Signed-off-by: Mary Guillemard * misc: Move Ryujinx.Ava project to Ryujinx This breaks CI for now, but it's fine. Signed-off-by: Mary Guillemard * infra: Make Avalonia the default UI Should fix CI after the previous changes. GTK3 isn't build by the release job anymore, only by PR CI. This also ensure that the test-ava update package is still generated to allow update from the old testing channel. Signed-off-by: Mary Guillemard * Fix missing copy in create_app_bundle.sh Signed-off-by: Mary Guillemard * Fix syntax error Signed-off-by: Mary Guillemard --------- Signed-off-by: Mary Guillemard --- .../UI/Models/Generic/LastPlayedSortComparer.cs | 31 ---------------------- .../UI/Models/Generic/TimePlayedSortComparer.cs | 31 ---------------------- 2 files changed, 62 deletions(-) delete mode 100644 src/Ryujinx.Ava/UI/Models/Generic/LastPlayedSortComparer.cs delete mode 100644 src/Ryujinx.Ava/UI/Models/Generic/TimePlayedSortComparer.cs (limited to 'src/Ryujinx.Ava/UI/Models/Generic') diff --git a/src/Ryujinx.Ava/UI/Models/Generic/LastPlayedSortComparer.cs b/src/Ryujinx.Ava/UI/Models/Generic/LastPlayedSortComparer.cs deleted file mode 100644 index 224f78f4..00000000 --- a/src/Ryujinx.Ava/UI/Models/Generic/LastPlayedSortComparer.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Ryujinx.UI.App.Common; -using System; -using System.Collections.Generic; - -namespace Ryujinx.Ava.UI.Models.Generic -{ - internal class LastPlayedSortComparer : IComparer - { - public LastPlayedSortComparer() { } - public LastPlayedSortComparer(bool isAscending) { IsAscending = isAscending; } - - public bool IsAscending { get; } - - public int Compare(ApplicationData x, ApplicationData y) - { - DateTime aValue = DateTime.UnixEpoch, bValue = DateTime.UnixEpoch; - - if (x?.LastPlayed != null) - { - aValue = x.LastPlayed.Value; - } - - if (y?.LastPlayed != null) - { - bValue = y.LastPlayed.Value; - } - - return (IsAscending ? 1 : -1) * DateTime.Compare(aValue, bValue); - } - } -} diff --git a/src/Ryujinx.Ava/UI/Models/Generic/TimePlayedSortComparer.cs b/src/Ryujinx.Ava/UI/Models/Generic/TimePlayedSortComparer.cs deleted file mode 100644 index f0fb035d..00000000 --- a/src/Ryujinx.Ava/UI/Models/Generic/TimePlayedSortComparer.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Ryujinx.UI.App.Common; -using System; -using System.Collections.Generic; - -namespace Ryujinx.Ava.UI.Models.Generic -{ - internal class TimePlayedSortComparer : IComparer - { - public TimePlayedSortComparer() { } - public TimePlayedSortComparer(bool isAscending) { IsAscending = isAscending; } - - public bool IsAscending { get; } - - public int Compare(ApplicationData x, ApplicationData y) - { - TimeSpan aValue = TimeSpan.Zero, bValue = TimeSpan.Zero; - - if (x?.TimePlayed != null) - { - aValue = x.TimePlayed; - } - - if (y?.TimePlayed != null) - { - bValue = y.TimePlayed; - } - - return (IsAscending ? 1 : -1) * TimeSpan.Compare(aValue, bValue); - } - } -} -- cgit v1.2.3