diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml
index e8c048a6c..b489e6934 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml
@@ -7,11 +7,13 @@
-
-
+
+
+
\ No newline at end of file
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs b/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs
index 7374297ea..834caba5b 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia.App/App.axaml.cs
@@ -73,10 +73,10 @@ namespace System.Application.UI
{
case Platform.Windows:
case Platform.Linux:
- notifyIcon.IconPath = "avares://Steam++/Assets/Icon.ico";
+ notifyIcon.IconPath = "avares://System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/Icon.ico";
break;
case Platform.Apple:
- notifyIcon.IconPath = "avares://Steam++/Assets/Icon_16.png";
+ notifyIcon.IconPath = "avares://System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/Icon_16.png";
break;
}
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj b/System.Application.SteamTools.Client.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj
index aff7b0395..c42db659b 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia.App/System.Application.SteamTools.Client.Desktop.Avalonia.App.csproj
@@ -1,73 +1,74 @@
-
- WinExe
- net5.0
- false
-
- System.Application.UI
- Steam++
- Assets\Icon.ico
- Properties\app.manifest
-
+
+ WinExe
+ net5.0
+ false
+
+ System.Application.UI
+ Steam++
+ ..\System.Application.SteamTools.Client.Desktop.Avalonia\Application\UI\Assets\Icon.ico
+ Properties\app.manifest
+
-
- net5.0-windows
-
+
+ net5.0-windows
+
-
-
- Properties\AssemblyInfo.cs
-
-
+
+
+ Properties\AssemblyInfo.cs
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
- MessageBox_Avalonia
-
-
+
+
+ MessageBox_Avalonia
+
+
-
-
- %(Filename)
-
-
- Designer
-
-
-
+
+
+ %(Filename)
+
+
+ Designer
+
+
+
-
-
-
- Assets\VisualElements_150.png
- PreserveNewest
-
-
- Assets\VisualElements_70.png
- PreserveNewest
-
-
- steam++.visualelementsmanifest.xml
- PreserveNewest
-
-
+
+
+
+ steam++.visualelementsmanifest.xml
+ PreserveNewest
+
+
+
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
\ No newline at end of file
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainWindow.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainWindow.axaml
index 6af31eead..f5e33b2d0 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainWindow.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainWindow.axaml
@@ -1,13 +1,13 @@
-
+
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Controls/CardView.axaml.cs b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Controls/CardView.axaml.cs
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Controls/CardView.axaml.cs
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Controls/CardView.axaml.cs
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/GameList.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/GameList.axaml
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/GameList.axaml
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/GameList.axaml
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/GameList.axaml.cs b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/GameList.axaml.cs
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/GameList.axaml.cs
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/GameList.axaml.cs
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/SettingsPage.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SettingsPage.axaml
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/SettingsPage.axaml
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SettingsPage.axaml
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/SettingsPage.axaml.cs b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SettingsPage.axaml.cs
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/Pages/SettingsPage.axaml.cs
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SettingsPage.axaml.cs
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Styles/Controls/SideBar.xaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/SideBar.xaml
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Styles/Controls/SideBar.xaml
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/SideBar.xaml
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Styles/Styles.xaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Styles.xaml
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Styles/Styles.xaml
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Styles.xaml
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/ViewModels/Settings/SettingsPageViewModel.cs b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/ViewModels/Settings/SettingsPageViewModel.cs
deleted file mode 100644
index 7d4a79f91..000000000
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/ViewModels/Settings/SettingsPageViewModel.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Avalonia.Controls;
-using ReactiveUI;
-using System.Application.UI.Resx;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace System.Application.UI.ViewModels
-{
- public class SettingsPageViewModel : ViewModelBase
- {
- public SettingsPageViewModel()
- {
- Languages = R.Languages.Select(Convert).ToList();
- }
-
- int mCurrentLanguageIndex;
-
- public int CurrentLanguageIndex
- {
- get => mCurrentLanguageIndex;
- set
- {
- this.RaiseAndSetIfChanged(ref mCurrentLanguageIndex, value);
- var cultureName = Languages[value].Tag?.ToString();
- if (string.IsNullOrWhiteSpace(cultureName))
- {
- cultureName = R.DefaultCurrentUICulture?.Name;
- }
- if (!string.IsNullOrWhiteSpace(cultureName))
- {
- R.ChangeLanguage(cultureName);
- }
- //if (!IsInDesignMode)
- //{
- // var localizationService = DI.Get();
- // var cultureName = Languages[value].Tag?.ToString();
- // if (string.IsNullOrWhiteSpace(cultureName))
- // {
- // cultureName = localizationService.DefaultCurrentUICulture?.Name;
- // }
- // if (!string.IsNullOrWhiteSpace(cultureName))
- // {
- // localizationService.ChangeLanguage(cultureName);
- // }
- //}
- }
- }
-
- public List Languages { get; }
-
- static ComboBoxItem Convert(KeyValuePair pair)
- => new ComboBoxItem { Tag = pair.Key, Content = pair.Value };
- }
-}
\ No newline at end of file
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainView.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows/MainView.axaml
similarity index 98%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainView.axaml
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows/MainView.axaml
index e2d9a8afc..ff79b2e45 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainView.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows/MainView.axaml
@@ -5,7 +5,7 @@
mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="600"
xmlns:pages="clr-namespace:System.Application.UI.Views.Pages"
xmlns:controls="clr-namespace:System.Application.UI.Views.Controls"
- xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop.Avalonia"
+ xmlns:vm="clr-namespace:System.Application.UI.ViewModels;assembly=System.Application.SteamTools.Client.Desktop"
xmlns:resx="clr-namespace:System.Application.UI.Resx;assembly=System.Application.SteamTools.Client.Desktop"
x:Class="System.Application.UI.Views.MainView"
FontSize="14"
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainView.axaml.cs b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows/MainView.axaml.cs
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia.App/Views/MainView.axaml.cs
rename to System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Windows/MainView.axaml.cs
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj b/System.Application.SteamTools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj
index baf14309f..2a40d121f 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/System.Application.SteamTools.Client.Desktop.Avalonia.csproj
@@ -1,41 +1,85 @@
-
- net5.0
- System
- false
-
-
+
+ net5.0
+ System
+ false
+
+
-
- AnyCPU
-
+
+ AnyCPU
+
-
-
- Properties\AssemblyInfo.cs
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
- MessageBox_Avalonia
-
-
+
+
+ Properties\AssemblyInfo.cs
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+ MessageBox_Avalonia
+
+
+
+
+
+
+
+
+
+ %(Filename)
+
+
+ Designer
+
+
+
+
+
+
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+
+
+
+
+
+ %(Filename)
+
+
+ %(Filename)
+
+
+ %(Filename)
+
+
+ %(Filename)
+
+
\ No newline at end of file
diff --git a/System.Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj b/System.Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj
index c8d0f3416..62bcab7a3 100644
--- a/System.Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj
+++ b/System.Application.SteamTools.Client.Desktop/System.Application.SteamTools.Client.Desktop.csproj
@@ -63,4 +63,8 @@
PreserveNewest
+
+
+
+
\ No newline at end of file
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/ViewModels/MainWindowViewModel.cs b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs
similarity index 100%
rename from System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/ViewModels/MainWindowViewModel.cs
rename to System.Application.SteamTools.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs
diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Settings/SettingsPageViewModel.cs b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Settings/SettingsPageViewModel.cs
new file mode 100644
index 000000000..d178893f4
--- /dev/null
+++ b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Settings/SettingsPageViewModel.cs
@@ -0,0 +1,53 @@
+using ReactiveUI;
+using System.Application.UI.Resx;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace System.Application.UI.ViewModels
+{
+ public class SettingsPageViewModel : ViewModelBase
+ {
+ public SettingsPageViewModel()
+ {
+ //Languages = R.Languages.Select(Convert).ToList();
+ }
+
+ //int mCurrentLanguageIndex;
+
+ //public int CurrentLanguageIndex
+ //{
+ // get => mCurrentLanguageIndex;
+ // set
+ // {
+ // this.RaiseAndSetIfChanged(ref mCurrentLanguageIndex, value);
+ // var cultureName = Languages[value].Tag?.ToString();
+ // if (string.IsNullOrWhiteSpace(cultureName))
+ // {
+ // cultureName = R.DefaultCurrentUICulture?.Name;
+ // }
+ // if (!string.IsNullOrWhiteSpace(cultureName))
+ // {
+ // R.ChangeLanguage(cultureName);
+ // }
+ // //if (!IsInDesignMode)
+ // //{
+ // // var localizationService = DI.Get();
+ // // var cultureName = Languages[value].Tag?.ToString();
+ // // if (string.IsNullOrWhiteSpace(cultureName))
+ // // {
+ // // cultureName = localizationService.DefaultCurrentUICulture?.Name;
+ // // }
+ // // if (!string.IsNullOrWhiteSpace(cultureName))
+ // // {
+ // // localizationService.ChangeLanguage(cultureName);
+ // // }
+ // //}
+ // }
+ //}
+
+ //public List