Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OnUIThread-Refactor and a few improvements #963

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OnUIThread-Refactor and a few improvements #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions src/Caliburn.Micro.Avalonia.Tests/ScopeNamingRouteTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ public void CorrectlyGetsAddedHop()
var d1 = new AvaloniaObject();
var d2 = new AvaloniaObject();
route.AddHop(d1, d2);
AvaloniaObject target;
var result = route.TryGetHop(d1, out target);
var result = route.TryGetHop(d1, out AvaloniaObject target);
Assert.True(result);
Assert.Same(d2, target);
}
Expand All @@ -52,9 +51,8 @@ public void GetsAllHopsAdded()
};

var source = d1;
AvaloniaObject target;

while (route.TryGetHop(source, out target))
while (route.TryGetHop(source, out AvaloniaObject target))
{
all.Remove(target);
source = target;
Expand Down
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Avalonia.Tests/ViewModelLocatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void ConfigureTypeMappingsShouldThrowWhenDefaultSubNamespaceForViewsIsNul


[Fact]
public void COnfigureTypeMappingsWithDefaultValuesShouldNotThrow()
public void ConfigureTypeMappingsWithDefaultValuesShouldNotThrow()
{
var typeMappingConfiguration = new TypeMappingConfiguration();

Expand Down
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Core.Tests/IoCTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void A_not_initialized_GetInstance_throws_an_InvalidOperationException()
}

[Fact]
public void A_null_GetInstance_throws_a_NullRefrenceException()
public void A_null_GetInstance_throws_a_NullReferenceException()
{
using (IoCReset.Create())
{
Expand Down
37 changes: 11 additions & 26 deletions src/Caliburn.Micro.Core.Tests/ScreenExtentionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,10 @@ public async Task Screen_ConductWithTests()
{
var root = new Screen();

var child1 = new StateScreen
{
DisplayName = "screen1"
};
var child1 = new StateScreen { DisplayName = "screen1" };
// simulate a long deactivation process
var child2 = new StateScreen(TimeSpan.FromSeconds(3))
{
DisplayName = "screen2"
};

var child3 = new StateScreen()
{
DisplayName = "screen3"
};
var child2 = new StateScreen(TimeSpan.FromSeconds(3)) { DisplayName = "screen2" };
var child3 = new StateScreen() { DisplayName = "screen3" };

child1.ConductWith(root);
child2.ConductWith(root);
Expand All @@ -49,20 +39,13 @@ public async Task Conductor_ConductWithTests()
{
var root = new Conductor<StateScreen>.Collection.AllActive();

var child1 = new StateScreen
{
DisplayName = "screen1"
};
var child1 = new StateScreen { DisplayName = "screen1" };
var child2 = new StateScreen(TimeSpan.FromSeconds(3))
{
DisplayName = "screen2",
IsClosable = false,
};

var child3 = new StateScreen()
{
DisplayName = "screen3"
};
var child3 = new StateScreen() { DisplayName = "screen3" };

root.Items.Add(child1);
root.Items.Add(child2);
Expand All @@ -81,8 +64,10 @@ public async Task Conductor_ConductWithTests()
Assert.True(child3.IsClosed, "child 3 should be closed");
}

class StateScreen : Screen
private sealed class StateScreen : Screen
{
private readonly TimeSpan? deactivationDelay;

public StateScreen()
{
}
Expand All @@ -93,7 +78,9 @@ public StateScreen(TimeSpan? deactivationDelay)
}

public bool WasActivated { get; private set; }

public bool IsClosed { get; private set; }

public bool IsClosable { get; set; }

public override Task<bool> CanCloseAsync(CancellationToken cancellationToken = default)
Expand Down Expand Up @@ -129,7 +116,7 @@ protected override async Task OnActivatedAsync(CancellationToken cancellationTok
IsClosable = false;
}

protected override async Task OnDeactivateAsync(bool close, CancellationToken cancellationToken = default(CancellationToken))
protected override async Task OnDeactivateAsync(bool close, CancellationToken cancellationToken = default)
{
await base.OnDeactivateAsync(close, cancellationToken);

Expand All @@ -140,8 +127,6 @@ protected override async Task OnActivatedAsync(CancellationToken cancellationTok

IsClosed = close;
}

private readonly TimeSpan? deactivationDelay;
}
}
}
36 changes: 18 additions & 18 deletions src/Caliburn.Micro.Core.Tests/SimpleContainerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void Null_is_returned_when_no_instance_is_found()
public class SimpleContainerRegisteringInstances
{
[Fact]
public void Instances_registed_Singleton_return_the_same_instance_for_each_call()
public void Instances_registered_Singleton_return_the_same_instance_for_each_call()
{
var container = new SimpleContainer();
container.Singleton<object>();
Expand Down Expand Up @@ -146,7 +146,7 @@ public void Container_Finds_Single_Constructor()

public class SingleNonEmptyConstructorType
{
public SingleNonEmptyConstructorType(SimpleContainer_Find_Constructor.SingleEmptyConstructorType type)
public SingleNonEmptyConstructorType(SingleEmptyConstructorType type)
{
}
}
Expand All @@ -165,18 +165,18 @@ public class SingleIntConstructor

public SingleIntConstructor(int x)
{
this.Value = x;
Value = x;
}
}

[Fact]
public void Container_SingleIntConstructor()
{
var container = new SimpleContainer();
container.Singleton<SingleIntConstructor>();
container.RegisterInstance(typeof(int), "x", 4);
var inst = (SingleIntConstructor)container.GetInstance(typeof(SingleIntConstructor), null);
Assert.Equal(4, inst.Value);
var sut = new SimpleContainer();
sut.Singleton<SingleIntConstructor>();
sut.RegisterInstance(typeof(int), "x", 4);
var result = (SingleIntConstructor)sut.GetInstance(typeof(SingleIntConstructor), null);
Assert.Equal(4, result.Value);
}

public class TwoConstructors
Expand All @@ -185,7 +185,7 @@ public class TwoConstructors

public TwoConstructors()
{
this.Value = 42;
Value = 42;
}

public TwoConstructors(int value)
Expand All @@ -197,20 +197,20 @@ public TwoConstructors(int value)
[Fact]
public void Container_ChooseConstructorWithRegisteredParameter()
{
var container = new SimpleContainer();
container.Singleton<TwoConstructors>();
container.RegisterInstance(typeof(int), null, 23);
var inst = (TwoConstructors)container.GetInstance(typeof(TwoConstructors), null);
Assert.Equal(23, inst.Value);
var sut = new SimpleContainer();
sut.Singleton<TwoConstructors>();
sut.RegisterInstance(typeof(int), null, 23);
var result = (TwoConstructors)sut.GetInstance(typeof(TwoConstructors), null);
Assert.Equal(23, result.Value);
}

[Fact]
public void Container_ChooseEmptyConstructorWithoutRegisteredParameter()
{
var container = new SimpleContainer();
container.Singleton<TwoConstructors>();
var inst = (TwoConstructors)container.GetInstance(typeof(TwoConstructors), null);
Assert.Equal(42, inst.Value);
var sut = new SimpleContainer();
sut.Singleton<TwoConstructors>();
var result = (TwoConstructors)sut.GetInstance(typeof(TwoConstructors), null);
Assert.Equal(42, result.Value);
}
}

Expand Down
4 changes: 1 addition & 3 deletions src/Caliburn.Micro.Core/AsyncEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ namespace Caliburn.Micro
/// <param name="sender">The source of the event.</param>
/// <param name="e">An object that contains the event data.</param>
/// <returns>A task that represents the asynchronous operation.</returns>
public delegate Task AsyncEventHandler<TEventArgs>(
object sender,
TEventArgs e)
public delegate Task AsyncEventHandler<TEventArgs>(object sender, TEventArgs e)
where TEventArgs : EventArgs;
}
83 changes: 23 additions & 60 deletions src/Caliburn.Micro.Core/BindableCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,7 @@ public virtual void NotifyOfPropertyChange(string propertyName)
{
if (IsNotifying)
{
if (PlatformProvider.Current.PropertyChangeNotificationsOnUIThread)
{
OnUIThread(() => OnPropertyChanged(new PropertyChangedEventArgs(propertyName)));
}
else
{
OnPropertyChanged(new PropertyChangedEventArgs(propertyName));
}
SafeRun(() => OnPropertyChanged(new PropertyChangedEventArgs(propertyName)));
}
}

Expand All @@ -59,21 +52,12 @@ public virtual void NotifyOfPropertyChange(string propertyName)
/// </summary>
public void Refresh()
{
if (PlatformProvider.Current.PropertyChangeNotificationsOnUIThread)
{
OnUIThread(() =>
{
OnPropertyChanged(new PropertyChangedEventArgs("Count"));
OnPropertyChanged(new PropertyChangedEventArgs("Item[]"));
OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
});
}
else
SafeRun(() =>
{
OnPropertyChanged(new PropertyChangedEventArgs("Count"));
OnPropertyChanged(new PropertyChangedEventArgs("Item[]"));
OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
}
});
}

/// <summary>
Expand All @@ -83,14 +67,7 @@ public void Refresh()
/// <param name = "item">The item to be inserted.</param>
protected override sealed void InsertItem(int index, T item)
{
if (PlatformProvider.Current.PropertyChangeNotificationsOnUIThread)
{
OnUIThread(() => InsertItemBase(index, item));
}
else
{
InsertItemBase(index, item);
}
SafeRun(() => InsertItemBase(index, item));
}

/// <summary>
Expand All @@ -113,14 +90,7 @@ protected virtual void InsertItemBase(int index, T item)
/// <param name = "item">The item to set.</param>
protected override sealed void SetItem(int index, T item)
{
if (PlatformProvider.Current.PropertyChangeNotificationsOnUIThread)
{
OnUIThread(() => SetItemBase(index, item));
}
else
{
SetItemBase(index, item);
}
SafeRun(() => SetItemBase(index, item));
}

/// <summary>
Expand All @@ -142,14 +112,7 @@ protected virtual void SetItemBase(int index, T item)
/// <param name = "index">The position used to identify the item to remove.</param>
protected override sealed void RemoveItem(int index)
{
if (PlatformProvider.Current.PropertyChangeNotificationsOnUIThread)
{
OnUIThread(() => RemoveItemBase(index));
}
else
{
RemoveItemBase(index);
}
SafeRun(() => RemoveItemBase(index));
}

/// <summary>
Expand Down Expand Up @@ -223,21 +186,15 @@ void AddRange()
InsertItemBase(index, item);
index++;
}

IsNotifying = previousNotificationSetting;

OnPropertyChanged(new PropertyChangedEventArgs("Count"));
OnPropertyChanged(new PropertyChangedEventArgs("Item[]"));
OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
}

if (PlatformProvider.Current.PropertyChangeNotificationsOnUIThread)
{
OnUIThread(AddRange);
}
else
{
AddRange();
}
SafeRun(AddRange);
}

/// <summary>
Expand All @@ -258,28 +215,34 @@ void RemoveRange()
RemoveItemBase(index);
}
}

IsNotifying = previousNotificationSetting;

OnPropertyChanged(new PropertyChangedEventArgs("Count"));
OnPropertyChanged(new PropertyChangedEventArgs("Item[]"));
OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
}

SafeRun(RemoveRange);
}

/// <summary>
/// Executes the given action on the UI thread
/// </summary>
/// <remarks>An extension point for subclasses to customize how property change notifications are handled.</remarks>
/// <param name="action"></param>
protected virtual void OnUIThread(Action action) => action.OnUIThread();

private void SafeRun(Action action)
K4PS3 marked this conversation as resolved.
Show resolved Hide resolved
{
if (PlatformProvider.Current.PropertyChangeNotificationsOnUIThread)
{
OnUIThread(RemoveRange);
OnUIThread(action);
}
else
{
RemoveRange();
action();
}
}

/// <summary>
/// Executes the given action on the UI thread
/// </summary>
/// <remarks>An extension point for subclasses to customise how property change notifications are handled.</remarks>
/// <param name="action"></param>
protected virtual void OnUIThread(System.Action action) => action.OnUIThread();
}
}
2 changes: 1 addition & 1 deletion src/Caliburn.Micro.Core/Conductor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public override async Task DeactivateItemAsync(T item, bool close, CancellationT

if (closeResult.CloseCanOccur)
{
await ChangeActiveItemAsync(default(T), close, cancellationToken);
await ChangeActiveItemAsync(default, close, cancellationToken);
}
}

Expand Down
Loading
Loading