From cdd2bcfb69b4ee178c7f7897b5dc3e05cbbaa3c1 Mon Sep 17 00:00:00 2001 From: Max Nullov Date: Tue, 25 Feb 2025 18:31:43 +0300 Subject: [PATCH] Project cleanup Rearranging sprites + removing redundant files --- Launcher-UI/Assets/Sprites/account-logo.png | Bin 0 -> 570 bytes Launcher-UI/Assets/{ => Sprites}/background.jpg | Bin Launcher-UI/Assets/{ => Sprites}/cog.png | Bin Launcher-UI/Assets/{ => Sprites}/gitlab-logo.png | Bin Launcher-UI/Assets/{ => Sprites}/icon.png | Bin Launcher-UI/Assets/{ => Sprites}/title.png | Bin Launcher-UI/Assets/{ => Sprites}/toml-paper.png | Bin Launcher-UI/ViewModels/SettingsWindowViewModel.cs | 6 ------ .../ViewModels/VersionSelectorWindowViewModel.cs | 10 ---------- Launcher-UI/Views/LoadingWindow.axaml | 2 +- Launcher-UI/Views/SettingsWindow.axaml | 8 ++++---- Launcher-UI/Views/VersionSelectorWindow.axaml | 6 +++--- 12 files changed, 8 insertions(+), 24 deletions(-) create mode 100644 Launcher-UI/Assets/Sprites/account-logo.png rename Launcher-UI/Assets/{ => Sprites}/background.jpg (100%) rename Launcher-UI/Assets/{ => Sprites}/cog.png (100%) rename Launcher-UI/Assets/{ => Sprites}/gitlab-logo.png (100%) rename Launcher-UI/Assets/{ => Sprites}/icon.png (100%) rename Launcher-UI/Assets/{ => Sprites}/title.png (100%) rename Launcher-UI/Assets/{ => Sprites}/toml-paper.png (100%) delete mode 100644 Launcher-UI/ViewModels/SettingsWindowViewModel.cs delete mode 100644 Launcher-UI/ViewModels/VersionSelectorWindowViewModel.cs diff --git a/Launcher-UI/Assets/Sprites/account-logo.png b/Launcher-UI/Assets/Sprites/account-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..b4aeee240313502247353d2fbbb63d1b47005db5 GIT binary patch literal 570 zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuFE&U}E%iaSW-L^Y-pRUnWO}wu@II z7S~2JsB>@NpM7Qb%n7QD`({4eYurAyX66s}GD|+7Mr5$#!P0#V)m8t0SpB|qzdG(X z>+*a5=f6K+9q;~Z>pq5gvl%=&Crn}R%r$lrlaNWby=qX%G)YK7lMzU)RCPb$*8F%) zZhNONNDWxw-mBsT&bxW~CSJV1?McI*^PC=D4NF+4Oq5l*yniuq>u#HE<=w|W_E|7O z?B<+s#q9r`yf4gcxBnSD>_9jQ=z2FX2{nIH3%5CN*JRBWEIRr?VrErK&l@8jB=KK@ zn_leLu{HO27s3QzQzx+>zplKQ_Pc62LNrzR$b*U*E0O(w_FG3>^W$%B?_ZkCZ?J?r zEX2}@r|+D};Ugr5$ErQ*DJA?(zg^@G_r5HUVNy|Z2x4MEj=*)F*uxBTo-dzXzY!$t M>FVdQ&MBb@0G0CD*#H0l literal 0 HcmV?d00001 diff --git a/Launcher-UI/Assets/background.jpg b/Launcher-UI/Assets/Sprites/background.jpg similarity index 100% rename from Launcher-UI/Assets/background.jpg rename to Launcher-UI/Assets/Sprites/background.jpg diff --git a/Launcher-UI/Assets/cog.png b/Launcher-UI/Assets/Sprites/cog.png similarity index 100% rename from Launcher-UI/Assets/cog.png rename to Launcher-UI/Assets/Sprites/cog.png diff --git a/Launcher-UI/Assets/gitlab-logo.png b/Launcher-UI/Assets/Sprites/gitlab-logo.png similarity index 100% rename from Launcher-UI/Assets/gitlab-logo.png rename to Launcher-UI/Assets/Sprites/gitlab-logo.png diff --git a/Launcher-UI/Assets/icon.png b/Launcher-UI/Assets/Sprites/icon.png similarity index 100% rename from Launcher-UI/Assets/icon.png rename to Launcher-UI/Assets/Sprites/icon.png diff --git a/Launcher-UI/Assets/title.png b/Launcher-UI/Assets/Sprites/title.png similarity index 100% rename from Launcher-UI/Assets/title.png rename to Launcher-UI/Assets/Sprites/title.png diff --git a/Launcher-UI/Assets/toml-paper.png b/Launcher-UI/Assets/Sprites/toml-paper.png similarity index 100% rename from Launcher-UI/Assets/toml-paper.png rename to Launcher-UI/Assets/Sprites/toml-paper.png diff --git a/Launcher-UI/ViewModels/SettingsWindowViewModel.cs b/Launcher-UI/ViewModels/SettingsWindowViewModel.cs deleted file mode 100644 index 3848b0f..0000000 --- a/Launcher-UI/ViewModels/SettingsWindowViewModel.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace LauncherGUI.ViewModels; - -public partial class SettingsWindowViewModel : ViewModelBase -{ - // I save launcher data mostly in MainWindowViewModel. -} diff --git a/Launcher-UI/ViewModels/VersionSelectorWindowViewModel.cs b/Launcher-UI/ViewModels/VersionSelectorWindowViewModel.cs deleted file mode 100644 index 5c26947..0000000 --- a/Launcher-UI/ViewModels/VersionSelectorWindowViewModel.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections.Generic; -using Plombir; -using LauncherGUI.ViewModels; - -namespace LauncherGUI.ViewModels; - -public partial class VersionSelectorWindowViewModel : ViewModelBase -{ - // I save launcher data mostly in MainWindowViewModel. -} diff --git a/Launcher-UI/Views/LoadingWindow.axaml b/Launcher-UI/Views/LoadingWindow.axaml index 4c287ab..468abbd 100644 --- a/Launcher-UI/Views/LoadingWindow.axaml +++ b/Launcher-UI/Views/LoadingWindow.axaml @@ -9,7 +9,7 @@ d:DesignHeight="200" x:Class="LauncherGUI.Views.LoadingWindow" x:DataType="vm:LoadingWindowViewModel" - Icon="/Assets/icon.png" + Icon="/Assets/Sprites/icon.png" Title="Loading" RequestedThemeVariant="Dark" Width="400" diff --git a/Launcher-UI/Views/SettingsWindow.axaml b/Launcher-UI/Views/SettingsWindow.axaml index 6b0fddd..f96f1c2 100644 --- a/Launcher-UI/Views/SettingsWindow.axaml +++ b/Launcher-UI/Views/SettingsWindow.axaml @@ -1,15 +1,15 @@ - diff --git a/Launcher-UI/Views/VersionSelectorWindow.axaml b/Launcher-UI/Views/VersionSelectorWindow.axaml index f55f812..781d8b1 100644 --- a/Launcher-UI/Views/VersionSelectorWindow.axaml +++ b/Launcher-UI/Views/VersionSelectorWindow.axaml @@ -1,12 +1,12 @@