Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions samples/ControlCatalog/Pages/RefreshContainerPage.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
</generic:List>
</ComboBox.ItemsSource>
</ComboBox>
<Button Content="Refresh" Name="RefreshButton"/>
</StackPanel>
</StackPanel>
<RefreshContainer Name="Refresh"
Expand Down
7 changes: 7 additions & 0 deletions samples/ControlCatalog/Pages/RefreshContainerPage.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,18 @@ public RefreshContainerPage()
{
InitializeComponent();

RefreshButton.Click += RefreshButton_Click;

_viewModel = new RefreshContainerViewModel();

DataContext = _viewModel;
}

private void RefreshButton_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
{
Refresh.RequestRefresh();
}

private async void RefreshContainerPage_RefreshRequested(object? sender, RefreshRequestedEventArgs e)
{
var deferral = e.GetDeferral();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
using System.Collections.ObjectModel;
using System.Linq;
using System.Threading.Tasks;
using Avalonia.Controls.Notifications;
using ControlCatalog.Pages;
using MiniMvvm;

namespace ControlCatalog.ViewModels
Expand Down
3 changes: 2 additions & 1 deletion src/Avalonia.Controls/PullToRefresh/RefreshVisualizer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ private void CalculateAndSetOffsets(Grid root, CompositionVisual visual, Composi
/// </summary>
public void RequestRefresh()
{
RefreshInfoProvider?.InteractionRatio = 1;
Comment thread
MrJul marked this conversation as resolved.
RefreshVisualizerState = RefreshVisualizerState.Refreshing;
RefreshInfoProvider?.OnRefreshStarted();

Expand All @@ -320,8 +321,8 @@ public void RequestRefresh()

private void RefreshCompleted()
{
RefreshInfoProvider?.InteractionRatio = 0;
RefreshVisualizerState = RefreshVisualizerState.Idle;

RefreshInfoProvider?.OnRefreshCompleted();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using Avalonia.Controls.PullToRefresh;
using Avalonia.Input;
using Avalonia.UnitTests;
using Xunit;

namespace Avalonia.Controls.UnitTests.PullToRefresh
{
public class RefreshVisualizerTests : ScopedTestBase
{
[Fact]
public void InteractionRatio_Is_One_While_Refreshing_And_Zero_After_Completion()
{
var provider = new RefreshInfoProvider(
PullDirection.TopToBottom,
new Size(100, 100),
visual: null);

var visualizer = new RefreshVisualizer();
visualizer.RefreshInfoProvider = provider;

var sawDuringRefresh = false;

visualizer.RefreshRequested += (s, e) =>
{
Assert.Equal(1d, provider.InteractionRatio);
sawDuringRefresh = true;
};

visualizer.RequestRefresh();

Assert.True(sawDuringRefresh, "RefreshRequested event should have been raised");

Assert.Equal(0d, provider.InteractionRatio);
}
}
}