asgardius/Ryujinx
1
0
Fork 0
mirror of https://github.com/GreemDev/Ryujinx synced 2025-01-02 09:10:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

UI: Rename App to RyujinxApp
Some checks are pending
Canary release job / Create tag (push) Waiting to run
Details
Canary release job / Release for linux-arm64 (push) Waiting to run
Details
Canary release job / Release for linux-x64 (push) Waiting to run
Details
Canary release job / Release for win-x64 (push) Waiting to run
Details
Canary release job / Release MacOS universal (push) Waiting to run
Details

Browse source 
Add more NotificationHelper methods
Simplify ID copy logic
This commit is contained in:
Evan Husted 2024-12-24 13:39:48 -06:00
parent 4d7350fc6e
commit 16a60fdf12
13 changed files with 82 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Ryujinx/Common/ApplicationHelper.cs
View file

@ -146,7 +146,7 @@ namespace Ryujinx.Ava.Common
var cancellationToken = new CancellationTokenSource();
UpdateWaitWindow waitingDialog = new(
App.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
RyujinxApp.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogNcaExtractionMessage, ncaSectionType, Path.GetFileName(titleFilePath)),
cancellationToken);
@ -268,10 +268,9 @@ namespace Ryujinx.Ava.Common
{
Dispatcher.UIThread.Post(waitingDialog.Close);
NotificationHelper.Show(
App.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
$"{titleName}\n\n{LocaleManager.Instance[LocaleKeys.DialogNcaExtractionSuccessMessage]}",
NotificationType.Information);
NotificationHelper.ShowInformation(
RyujinxApp.FormatTitle(LocaleKeys.DialogNcaExtractionTitle),
$"{titleName}\n\n{LocaleManager.Instance[LocaleKeys.DialogNcaExtractionSuccessMessage]}");
}
}

6
src/Ryujinx/Program.cs
View file

@ -65,7 +65,7 @@ namespace Ryujinx.Ava
}
public static AppBuilder BuildAvaloniaApp() =>
AppBuilder.Configure<App>()
AppBuilder.Configure<RyujinxApp>()
.UsePlatformDetect()
.With(new X11PlatformOptions
{
@ -100,7 +100,7 @@ namespace Ryujinx.Ava
// Delete backup files after updating.
Task.Run(Updater.CleanupUpdate);
Console.Title = $"{App.FullAppName} Console {Version}";
Console.Title = $"{RyujinxApp.FullAppName} Console {Version}";
// Hook unhandled exception and process exit events.
AppDomain.CurrentDomain.UnhandledException += (sender, e)
@ -225,7 +225,7 @@ namespace Ryujinx.Ava
private static void PrintSystemInfo()
{
Logger.Notice.Print(LogClass.Application, $"{App.FullAppName} Version: {Version}");
Logger.Notice.Print(LogClass.Application, $"{RyujinxApp.FullAppName} Version: {Version}");
SystemInfo.Gather().Print();
var enabledLogLevels = Logger.GetEnabledLevels().ToArray();

2
src/Ryujinx/App.axaml → src/Ryujinx/RyujinxApp.axaml
View file

@ -1,5 +1,5 @@
<Application
x:Class="Ryujinx.Ava.App"
x:Class="Ryujinx.Ava.RyujinxApp"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sty="using:FluentAvalonia.Styling">

12
src/Ryujinx/App.axaml.cs → src/Ryujinx/RyujinxApp.axaml.cs
View file

@ -1,5 +1,6 @@
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Input.Platform;
using Avalonia.Markup.Xaml;
using Avalonia.Platform;
using Avalonia.Styling;
@ -19,7 +20,7 @@ using System.Diagnostics;
namespace Ryujinx.Ava
{
public class App : Application
public class RyujinxApp : Application
{
internal static string FormatTitle(LocaleKeys? windowTitleKey = null)
=> windowTitleKey is null
@ -32,8 +33,11 @@ namespace Ryujinx.Ava
.ApplicationLifetime.Cast<IClassicDesktopStyleApplicationLifetime>()
.MainWindow.Cast<MainWindow>();
public static IClassicDesktopStyleApplicationLifetime DesktopLifetime => Current!
.ApplicationLifetime.Cast<IClassicDesktopStyleApplicationLifetime>();
public static bool IsClipboardAvailable(out IClipboard clipboard)
{
clipboard = MainWindow.Clipboard;
return clipboard != null;
}
public static void SetTaskbarProgress(TaskBarProgressBarState state) => MainWindow.PlatformFeatures.SetTaskBarProgressBarState(state);
public static void SetTaskbarProgressValue(ulong current, ulong total) => MainWindow.PlatformFeatures.SetTaskBarProgressBarValue(current, total);
@ -135,7 +139,7 @@ namespace Ryujinx.Ava
};
public static ThemeVariant DetectSystemTheme() =>
Current is App { PlatformSettings: not null } app
Current is RyujinxApp { PlatformSettings: not null } app
? ConvertThemeVariant(app.PlatformSettings.GetColorValues().ThemeVariant)
: ThemeVariant.Default;
}

20
src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
View file

@ -43,17 +43,19 @@ namespace Ryujinx.Ava.UI.Controls
if (sender is not Button { Content: TextBlock idText })
return;
if (!RyujinxApp.IsClipboardAvailable(out var clipboard))
return;
if (App.MainWindow.Clipboard is { } clipboard)
{
var appData = mwvm.Applications.FirstOrDefault(it => it.IdString == idText.Text);
if (appData is null)
return;
var appData = mwvm.Applications.FirstOrDefault(it => it.IdString == idText.Text);
if (appData is null)
return;
await clipboard.SetTextAsync(appData.IdString);
await clipboard.SetTextAsync(appData.IdString);
NotificationHelper.Show("Copied Title ID", $"{appData.Name} ({appData.IdString})", NotificationType.Information);
}
NotificationHelper.ShowInformation(
"Copied Title ID",
$"{appData.Name} ({appData.IdString})");
}
}
}

45
src/Ryujinx/UI/Helpers/NotificationHelper.cs
View file

@ -62,9 +62,46 @@ namespace Ryujinx.Ava.UI.Helpers
_notifications.Add(new Notification(title, text, type, delay, onClick, onClose));
}
public static void ShowError(string message)
{
Show(LocaleManager.Instance[LocaleKeys.DialogErrorTitle], $"{LocaleManager.Instance[LocaleKeys.DialogErrorMessage]}\n\n{message}", NotificationType.Error);
}
public static void ShowError(string message) =>
ShowError(
LocaleManager.Instance[LocaleKeys.DialogErrorTitle],
$"{LocaleManager.Instance[LocaleKeys.DialogErrorMessage]}\n\n{message}"
);
public static void ShowInformation(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
Show(
title,
text,
NotificationType.Information,
waitingExit,
onClick,
onClose);
public static void ShowSuccess(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
Show(
title,
text,
NotificationType.Success,
waitingExit,
onClick,
onClose);
public static void ShowWarning(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
Show(
title,
text,
NotificationType.Warning,
waitingExit,
onClick,
onClose);
public static void ShowError(string title, string text, bool waitingExit = false, Action onClick = null, Action onClose = null) =>
Show(
title,
text,
NotificationType.Error,
waitingExit,
onClick,
onClose);
}
}

4
src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs
View file

@ -51,7 +51,7 @@ namespace Ryujinx.Ava.UI.ViewModels
public AboutWindowViewModel()
{
Version = App.FullAppName + "\n" + Program.Version;
Version = RyujinxApp.FullAppName + "\n" + Program.Version;
UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value);
ThemeManager.ThemeChanged += ThemeManager_ThemeChanged;
@ -64,7 +64,7 @@ namespace Ryujinx.Ava.UI.ViewModels
private void UpdateLogoTheme(string theme)
{
bool isDarkTheme = theme == "Dark" || (theme == "Auto" && App.DetectSystemTheme() == ThemeVariant.Dark);
bool isDarkTheme = theme == "Dark" || (theme == "Auto" && RyujinxApp.DetectSystemTheme() == ThemeVariant.Dark);
string basePath = "resm:Ryujinx.UI.Common.Resources.";
string themeSuffix = isDarkTheme ? "Dark.png" : "Light.png";

2
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
View file

@ -2051,7 +2051,7 @@ namespace Ryujinx.Ava.UI.ViewModels
Dispatcher.UIThread.InvokeAsync(() =>
{
Title = App.FormatTitle();
Title = RyujinxApp.FormatTitle();
});
}

4
src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs
View file

@ -16,7 +16,7 @@ namespace Ryujinx.Ava.UI.Windows
InitializeComponent();
Title = App.FormatTitle(LocaleKeys.Amiibo);
Title = RyujinxApp.FormatTitle(LocaleKeys.Amiibo);
}
public AmiiboWindow()
@ -27,7 +27,7 @@ namespace Ryujinx.Ava.UI.Windows
if (Program.PreviewerDetached)
{
Title = App.FormatTitle(LocaleKeys.Amiibo);
Title = RyujinxApp.FormatTitle(LocaleKeys.Amiibo);
}
}

4
src/Ryujinx/UI/Windows/CheatWindow.axaml.cs
View file

@ -28,7 +28,7 @@ namespace Ryujinx.Ava.UI.Windows
InitializeComponent();
Title = App.FormatTitle(LocaleKeys.CheatWindowTitle);
Title = RyujinxApp.FormatTitle(LocaleKeys.CheatWindowTitle);
}
public CheatWindow(VirtualFileSystem virtualFileSystem, string titleId, string titleName, string titlePath)
@ -93,7 +93,7 @@ namespace Ryujinx.Ava.UI.Windows
DataContext = this;
Title = App.FormatTitle(LocaleKeys.CheatWindowTitle);
Title = RyujinxApp.FormatTitle(LocaleKeys.CheatWindowTitle);
}
public void Save()

4
src/Ryujinx/UI/Windows/MainWindow.axaml.cs
View file

@ -86,7 +86,7 @@ namespace Ryujinx.Ava.UI.Windows
UiHandler = new AvaHostUIHandler(this);
ViewModel.Title = App.FormatTitle();
ViewModel.Title = RyujinxApp.FormatTitle();
TitleBar.ExtendsContentIntoTitleBar = !ConfigurationState.Instance.ShowTitleBar;
TitleBar.TitleBarHitTestType = (ConfigurationState.Instance.ShowTitleBar) ? TitleBarHitTestType.Simple : TitleBarHitTestType.Complex;
@ -117,7 +117,7 @@ namespace Ryujinx.Ava.UI.Windows
/// </summary>
private static void OnPlatformColorValuesChanged(object sender, PlatformColorValues e)
{
if (Application.Current is App app)
if (Application.Current is RyujinxApp app)
app.ApplyConfiguredTheme(ConfigurationState.Instance.UI.BaseStyle);
}

2
src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
View file

@ -14,7 +14,7 @@ namespace Ryujinx.Ava.UI.Windows
public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager)
{
Title = App.FormatTitle(LocaleKeys.Settings);
Title = RyujinxApp.FormatTitle(LocaleKeys.Settings);
DataContext = ViewModel = new SettingsViewModel(virtualFileSystem, contentManager);

8
src/Ryujinx/Updater.cs
View file

@ -76,7 +76,7 @@ namespace Ryujinx.Ava
if (!Version.TryParse(Program.Version, out Version currentVersion))
{
Logger.Error?.Print(LogClass.Application, $"Failed to convert the current {App.FullAppName} version!");
Logger.Error?.Print(LogClass.Application, $"Failed to convert the current {RyujinxApp.FullAppName} version!");
await ContentDialogHelper.CreateWarningDialog(
LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedMessage],
@ -159,7 +159,7 @@ namespace Ryujinx.Ava
if (!Version.TryParse(_buildVer, out Version newVersion))
{
Logger.Error?.Print(LogClass.Application, $"Failed to convert the received {App.FullAppName} version from GitHub!");
Logger.Error?.Print(LogClass.Application, $"Failed to convert the received {RyujinxApp.FullAppName} version from GitHub!");
await ContentDialogHelper.CreateWarningDialog(
LocaleManager.Instance[LocaleKeys.DialogUpdaterConvertFailedGithubMessage],
@ -266,7 +266,7 @@ namespace Ryujinx.Ava
SubHeader = LocaleManager.Instance[LocaleKeys.UpdaterDownloading],
IconSource = new SymbolIconSource { Symbol = Symbol.Download },
ShowProgressBar = true,
XamlRoot = App.MainWindow,
XamlRoot = RyujinxApp.MainWindow,
};
taskDialog.Opened += (s, e) =>
@ -490,7 +490,7 @@ namespace Ryujinx.Ava
bytesWritten += readSize;
taskDialog.SetProgressBarState(GetPercentage(bytesWritten, totalBytes), TaskDialogProgressState.Normal);
App.SetTaskbarProgressValue(bytesWritten, totalBytes);
RyujinxApp.SetTaskbarProgressValue(bytesWritten, totalBytes);
updateFileStream.Write(buffer, 0, readSize);
}