Merge pull request #5 from Hen676/DataGrid

Data grid
Hen676 · Oct 2, 2022 · 9f76067 · 9f76067
2 parents b47cb81 + 6ae1f04
commit 9f76067
Show file tree

Hide file tree

Showing 18 changed files with 1,238 additions and 310 deletions.
diff --git a/FadedVanguardLogUploader/App.axaml b/FadedVanguardLogUploader/App.axaml
@@ -6,4 +6,9 @@
     <Application.DataTemplates>
         <local:ViewLocator/>
     </Application.DataTemplates>
+
+	<Application.Styles>
+	    <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
+	</Application.Styles>
+
 </Application>
diff --git a/FadedVanguardLogUploader/App.axaml.cs b/FadedVanguardLogUploader/App.axaml.cs
@@ -14,15 +14,13 @@ namespace FadedVanguardLogUploader
     public partial class App : Application
     {
         public static AppSettings Settings = new();
-        public static FluentTheme Fluent = new(new Uri("avares://ControlCatalog/Styles"));
-
+        private static FluentTheme Fluent = new(new Uri("avares://ControlCatalog/Styles"));
         public override void Initialize()
         {
             if (Settings.ApiToggle)
                 GW2ApiHttps.Init();
 
             Fluent.Mode = Settings.ModeToggle ? FluentThemeMode.Dark : FluentThemeMode.Light;
-
             Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfoByIetfLanguageTag(Settings.Lang);
 
             Styles.Insert(0, Fluent);

diff --git a/FadedVanguardLogUploader/Enums/SortingType.cs b/FadedVanguardLogUploader/Enums/SortingType.cs
@@ -5,6 +5,6 @@ public enum SortingType
         Date,
         Length,
         User,
-        Charcter,
+        Charcter
     }
 }
diff --git a/FadedVanguardLogUploader/FadedVanguardLogUploader.csproj b/FadedVanguardLogUploader/FadedVanguardLogUploader.csproj
@@ -20,11 +20,12 @@
     <TrimmableAssembly Include="Avalonia.Themes.Default" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.12" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
+    <PackageReference Include="Avalonia" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.18" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.12" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.12" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
     <PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.8" />
     <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.8" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />