Workaround tap gestures not registering correctly on touch devices

aetherstrata · Feb 10, 2024 · d886e5a · d886e5a
1 parent df18e18
commit d886e5a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/Aosta.Ava/Aosta.Ava.Android/Aosta.Ava.Android.csproj b/Aosta.Ava/Aosta.Ava.Android/Aosta.Ava.Android.csproj
@@ -19,7 +19,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia.Android" Version="11.0.7" />
+        <PackageReference Include="Avalonia.Android" Version="11.0.9" />
         <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.5" />
     </ItemGroup>
 

diff --git a/Aosta.Ava/Aosta.Ava.Desktop/Aosta.Ava.Desktop.csproj b/Aosta.Ava/Aosta.Ava.Desktop/Aosta.Ava.Desktop.csproj
@@ -14,9 +14,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.7" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.9" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.7" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.9" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Aosta.Ava/Aosta.Ava/Aosta.Ava.csproj b/Aosta.Ava/Aosta.Ava/Aosta.Ava.csproj
@@ -12,11 +12,11 @@
 
     <ItemGroup>
         <PackageReference Include="AsyncImageLoader.Avalonia" Version="3.2.1" />
-        <PackageReference Include="Avalonia" Version="11.0.7" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.7" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.7" />
+        <PackageReference Include="Avalonia" Version="11.0.9" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.9" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.9" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.7" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.9" />
         <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.6" />
         <PackageReference Include="FluentAvaloniaUI" Version="2.0.5" />
         <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />

diff --git a/Aosta.Ava/Aosta.Ava/Pages/JikanAnimeDetailsPage.axaml b/Aosta.Ava/Aosta.Ava/Pages/JikanAnimeDetailsPage.axaml
@@ -7,7 +7,6 @@
              xmlns:local="clr-namespace:Aosta.Ava.Controls"
              xmlns:localize="clr-namespace:Aosta.Ava.Localization"
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-             xmlns:contracts="clr-namespace:Aosta.Ava.ViewModels.Contracts"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Aosta.Ava.Pages.JikanAnimeDetailsPage"
              x:DataType="viewModels:JikanAnimeDetailsViewModel">

diff --git a/Aosta.Ava/Aosta.Ava/Pages/SearchPage.axaml b/Aosta.Ava/Aosta.Ava/Pages/SearchPage.axaml
@@ -47,6 +47,12 @@
                  ItemsSource="{Binding SearchResults}">
             <ListBox.ItemTemplate>
                 <DataTemplate>
+                    <Button Margin="0"
+                            Padding="0"
+                            HorizontalAlignment="Stretch"
+                            HorizontalContentAlignment="Stretch"
+                            Command="{Binding GoToDetails}">
+
                     <Grid ColumnDefinitions="Auto,*,Auto"
                           Background="{DynamicResource TitleBarBackgroundBrush}">
                         <Image asyncImageLoader:ImageLoader.Source="{Binding Banner}"
@@ -57,7 +63,7 @@
                                    Margin="5"
                                    HorizontalAlignment="Left" />
                         <Button Grid.Column="2"
-                                Margin="0,0,10,0"
+                                Margin="0,10,10,10"
                                 Padding="0"
                                 Width="36"
                                 Height="36"
@@ -67,12 +73,8 @@
                                                FontFamily="{StaticResource SymbolThemeFontFamily}"
                                                FontSize="20" />
                         </Button>
-                        <Interaction.Behaviors>
-                            <EventTriggerBehavior EventName="Tapped">
-                                <InvokeCommandAction Command="{Binding GoToDetails}"/>
-                            </EventTriggerBehavior>
-                        </Interaction.Behaviors>
                     </Grid>
+                    </Button>
                 </DataTemplate>
             </ListBox.ItemTemplate>
             <ListBox.Styles>

diff --git a/Aosta.Ava/Aosta.Ava/Pages/SearchPage.axaml.cs b/Aosta.Ava/Aosta.Ava/Pages/SearchPage.axaml.cs
@@ -3,6 +3,8 @@
 using Avalonia.Input;
 using Avalonia.ReactiveUI;
 
+using Serilog;
+
 namespace Aosta.Ava.Pages;
 
 public partial class SearchPage : ReactiveUserControl<SearchPageViewModel>