From a01a8c4b19decb10f1eb55032f5ad39d92beb0ed Mon Sep 17 00:00:00 2001 From: Michael Bucari-Tovo Date: Wed, 7 Dec 2022 10:15:12 -0700 Subject: [PATCH] Update Avalonia to v.11-Preview-4 --- Source/LibationAvalonia/App.axaml | 6 ++--- .../Controls/LinkLabel.axaml.cs | 8 +++--- .../Dialogs/BookDetailsDialog.axaml.cs | 3 ++- .../Login/LoginChoiceEagerDialog.axaml.cs | 2 +- .../MessageBoxAlertAdminDialog.axaml.cs | 4 +-- .../Dialogs/MessageBoxWindow.axaml | 2 +- .../LibationAvalonia/LibationAvalonia.csproj | 20 ++++++++------- .../ViewModels/ProductsDisplayViewModel.cs | 1 + .../Views/MainWindow/MainWindow.axaml | 23 ++++++++++++------ .../Views/ProductsDisplay.axaml | 8 +++--- .../Views/ProductsDisplay.axaml.cs | 9 ++++--- .../Visualizers/attribcache140.bin | Bin 0 -> 7853 bytes 12 files changed, 48 insertions(+), 38 deletions(-) create mode 100644 Source/Visual Studio 2022/Visualizers/attribcache140.bin diff --git a/Source/LibationAvalonia/App.axaml b/Source/LibationAvalonia/App.axaml index cbfd5ab2..9e8d399d 100644 --- a/Source/LibationAvalonia/App.axaml +++ b/Source/LibationAvalonia/App.axaml @@ -8,9 +8,9 @@ - - - + + + diff --git a/Source/LibationAvalonia/Controls/LinkLabel.axaml.cs b/Source/LibationAvalonia/Controls/LinkLabel.axaml.cs index 0d75021e..30b0d74a 100644 --- a/Source/LibationAvalonia/Controls/LinkLabel.axaml.cs +++ b/Source/LibationAvalonia/Controls/LinkLabel.axaml.cs @@ -15,15 +15,15 @@ namespace LibationAvalonia.Controls { InitializeComponent(); } - protected override void OnPointerEnter(PointerEventArgs e) + protected override void OnPointerEntered(PointerEventArgs e) { this.Cursor = HandCursor; - base.OnPointerEnter(e); + base.OnPointerEntered(e); } - protected override void OnPointerLeave(PointerEventArgs e) + protected override void OnPointerExited(PointerEventArgs e) { this.Cursor = Cursor.Default; - base.OnPointerLeave(e); + base.OnPointerExited(e); } private void InitializeComponent() diff --git a/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs index 180c736a..a48d2075 100644 --- a/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs +++ b/Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml.cs @@ -10,6 +10,7 @@ using LibationAvalonia.ViewModels; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; +using System; namespace LibationAvalonia.Dialogs { @@ -54,7 +55,7 @@ namespace LibationAvalonia.Dialogs base.SaveAndClose(); } - public void GoToAudible_Tapped(object sender, Avalonia.Interactivity.RoutedEventArgs e) + public void GoToAudible_Tapped(object sender, Avalonia.Input.TappedEventArgs e) { var locale = AudibleApi.Localization.Get(_libraryBook.Book.Locale); var link = $"https://www.audible.{locale.TopDomain}/pd/{_libraryBook.Book.AudibleProductId}"; diff --git a/Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml.cs index 4871ab16..bbc873d9 100644 --- a/Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml.cs +++ b/Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml.cs @@ -31,7 +31,7 @@ namespace LibationAvalonia.Dialogs.Login DataContext = this; } - public async void ExternalLoginLink_Tapped(object sender, Avalonia.Interactivity.RoutedEventArgs e) + public async void ExternalLoginLink_Tapped(object sender, Avalonia.Input.TappedEventArgs e) { LoginMethod = LoginMethod.External; await SaveAndCloseAsync(); diff --git a/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml.cs b/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml.cs index e139605b..df263867 100644 --- a/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml.cs +++ b/Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml.cs @@ -28,7 +28,7 @@ namespace LibationAvalonia.Dialogs DataContext = this; } - private async void GoToGithub_Tapped(object sender, Avalonia.Interactivity.RoutedEventArgs e) + private async void GoToGithub_Tapped(object sender, Avalonia.Input.TappedEventArgs e) { var url = "https://github.com/rmcrackan/Libation/issues"; try @@ -41,7 +41,7 @@ namespace LibationAvalonia.Dialogs } } - private async void GoToLogs_Tapped(object sender, Avalonia.Interactivity.RoutedEventArgs e) + private async void GoToLogs_Tapped(object sender, Avalonia.Input.TappedEventArgs e) { LongPath dir = ""; try diff --git a/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml b/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml index 416eebb8..293a6218 100644 --- a/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml +++ b/Source/LibationAvalonia/Dialogs/MessageBoxWindow.axaml @@ -6,7 +6,7 @@ mc:Ignorable="d" d:DesignWidth="265" d:DesignHeight="110" MinWidth="265" MinHeight="110" x:Class="LibationAvalonia.Dialogs.MessageBoxWindow" - Title="{Binding Caption}" HasSystemDecorations="True" ShowInTaskbar="True" + Title="{Binding Caption}" IsExtendedIntoWindowDecorations="True" ShowInTaskbar="True" Icon="/Assets/1x1.png"> diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj index 41b319df..9e38445c 100644 --- a/Source/LibationAvalonia/LibationAvalonia.csproj +++ b/Source/LibationAvalonia/LibationAvalonia.csproj @@ -128,17 +128,19 @@ + + + + + + + + + + - - - - - - - - - + Always diff --git a/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs b/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs index 8468ba55..af318103 100644 --- a/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs +++ b/Source/LibationAvalonia/ViewModels/ProductsDisplayViewModel.cs @@ -13,6 +13,7 @@ using ApplicationServices; using AudibleUtilities; using LibationAvalonia.Views; using LibationAvalonia.Dialogs.Login; +using Avalonia.Collections; namespace LibationAvalonia.ViewModels { diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml b/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml index 37a28f7b..d0b9a900 100644 --- a/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml +++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml @@ -12,7 +12,7 @@ Name="Form1" Icon="/Assets/libation.ico"> - + @@ -143,23 +143,30 @@ + - - + diff --git a/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs b/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs index b5a7c532..6f015b8c 100644 --- a/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs +++ b/Source/LibationAvalonia/Views/ProductsDisplay.axaml.cs @@ -29,6 +29,7 @@ namespace LibationAvalonia.Views using var context = DbContexts.GetContext(); List sampleEntries = new() { + new LibraryBookEntry(context.GetLibraryBook_Flat_NoTracking("B00DCD0OXU")), new LibraryBookEntry(context.GetLibraryBook_Flat_NoTracking("B017V4IM1G")), new LibraryBookEntry(context.GetLibraryBook_Flat_NoTracking("B017V4IWVG")), new LibraryBookEntry(context.GetLibraryBook_Flat_NoTracking("B017V4JA2Q")), @@ -40,8 +41,8 @@ namespace LibationAvalonia.Views DataContext = new ProductsDisplayViewModel(sampleEntries); return; } - Configure_ColumnCustomization(); + foreach (var column in productsGrid.Columns) { column.CustomSortComparer = new RowComparer(column); @@ -198,7 +199,7 @@ namespace LibationAvalonia.Views //Expanding and collapsing reset the list, which will cause focus to shift //to the topright cell. Reset focus onto the clicked button's cell. - ((sender as Control).Parent.Parent as DataGridCell)?.Focus(); + (sender as Button).Parent?.Focus(); } else if (button.DataContext is LibraryBookEntry lbEntry) { @@ -212,7 +213,7 @@ namespace LibationAvalonia.Views imageDisplayDialog.Close(); } - public void Cover_Click(object sender, Avalonia.Interactivity.RoutedEventArgs args) + public void Cover_Click(object sender, Avalonia.Input.TappedEventArgs args) { if (sender is not Image tblock || tblock.DataContext is not GridEntry gEntry) return; @@ -252,7 +253,7 @@ namespace LibationAvalonia.Views imageDisplayDialog.Show(); } - public void Description_Click(object sender, Avalonia.Interactivity.RoutedEventArgs args) + public void Description_Click(object sender, Avalonia.Input.TappedEventArgs args) { if (sender is TextBlock tblock && tblock.DataContext is GridEntry gEntry) { diff --git a/Source/Visual Studio 2022/Visualizers/attribcache140.bin b/Source/Visual Studio 2022/Visualizers/attribcache140.bin new file mode 100644 index 0000000000000000000000000000000000000000..06f7ff3fe7ebfd35eaa43d08130aa0b24697139b GIT binary patch literal 7853 zcmeHMTXWk)6qXt2bXqQ@H=0sFEu}ykOw$WxI%Jq6jvLclOzd1rUFcd~J4hQ+GcTXontAQ*+&{nk zdF+^RveNYgZRZO_kmG+mt8LHR`S;gXjaLlAI1`zY^A#$V)|kaz&uxnQHuHR9SA^eS zZoWY4eyc^fUKdQVXK5q5xEJt>tl28fn%k6n%ys7H?&WXd->kXh+rsB`-l4wW#GW(`pNI z00o}mToU*ysoV4=^k869gZ?Z+FL6zPe>MsJHlv3xv7aXPXApaYH39v*Y0$3`hk#>w zsex%~;G))mLN}s_<89A!xy|ZfG`Jw6!40LHCD*p8CBRdA`3KaYoLTwOvg5ZYM=$ks z?s4_W!*NbHLNIWBQ8t6oTKd}QMT~E!C~Ocpn&~1>J9?atY!gu+1duSQSGyf*!eN1c~gG-X3@88J)+zFJ`x(AW~dng?>4c0S|*G?y=CNPYQ4uj7@T!}>d%@zIfv~h z0jpDr)$)-=J7_RQ?)6%)w?;h=ZnWA@-}!}32SPi+WtrQ&a@8_BReFZ`$r*rcmeA9>FJbskS`4Q>!kCYT%uSS>NyB0=!)b3omWti_Fd@ z#RU=4P>%s=itgh(C&)ijhXe4G%gzs)DaRPTotHH{)bcqK-F!tgGLd>qQ5C37TSR~d zI$MKlk7`FB6tn=HlRM05xQE^%@#yinzrNi5?ThuhIT>yA$<+#|FFF*A*|EAC^&cVp zd^OH#?{u0~PU#?ysCorUlHK9S>4lST{=a0=z#t1K6_xA5az>XL7lcPEeF7M3B?99%LXcM?;bg#Xd~il~`q$pOJ{m2`CV?jx4FKq6LXKGi5*yqr;YQA^^(x@DEkPSlBgmXF(kDu| ztD}WOh_r0!%DEmVUJ-3OR4aB$PRAFT1zcd6SEAj@hLS+XHih;O6IGfh#zyX9tyglO zTG3dA9mVhCF+w5T0;fcpaH>R~jNu@Ug=|K%n4N^hz?dMfPe?M_oIam~bCaR@pyjMEID zyqa*6_VtV-j`vu(sdsn``6uXfdCN8HBYr6IE4`5Hbwpk1QOs;TI&X=fLc8rGCKR;dFR11126 z%qL+1HZ$SF@U{dm75g#x;G*LM8Z=6y+lrH}eB;NN&`YFafyDTNikcYZDbjt^n(KQ} zOM?6%ks+Hw?8SowEp?1Ae~6*FjxT@A+UgYCL&(RT*Y?weg_kCH;u+}c3S|E_>x79i z$`~6^qK1iMOw=-WTWA0;bV<`$$0FzCDcJ~S%-S2{8`EPT_#lc!()YFAB0ds%QirnD zH+NjV59J&tF*qFQ_RTV9ZNj@au9|(bKo6KDUn6jM&{GhnD=f$r;SoS zAsc;j*^${Ud=#hjI9P%AKp`l&(^ZI~*eSan!}mcHCpG}?l)gVx-Cbscu|9q zS~T51=p7^W204%%l{X}4^-cMe)nw38$4I~BWAvzB4&$z&%HU2JIq)ha2Ot1Hk7v;B hOxUU%p1xklz|+-%Zv^XZ1EPL