AMT-Cheif
/
Stylet
mirror of https://github.com/AMT-Cheif/Stylet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename Conductor<T>.Collections to Conductor<T>.Collection, and move Conductor<T>.Collections.Nagivation to Conductor<T>.StackNavigation

This commit is contained in:
Antony Male 2014-04-24 08:11:21 +01:00
parent 559277d809
commit 9e96e8c052
9 changed files with 95 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Samples/Stylet.Samples.RedditBrowser/Pages/ShellViewModel.cs
View File

@ -7,7 +7,7 @@ using System.Threading.Tasks;
namespace Stylet.Samples.RedditBrowser.Pages
{
public class ShellViewModel : Conductor<IScreen>.Collections.OneActive, IHandle<OpenSubredditEvent>
public class ShellViewModel : Conductor<IScreen>.Collection.OneActive, IHandle<OpenSubredditEvent>
{
private ISubredditViewModelFactory subredditViewModelFactory;

2
Samples/Stylet.Samples.RedditBrowser/Pages/SubredditViewModel.cs
View File

@ -7,7 +7,7 @@ using System.Threading.Tasks;
namespace Stylet.Samples.RedditBrowser.Pages
{
public class SubredditViewModel : Conductor<IScreen>.Collections.Navigation
public class SubredditViewModel : Conductor<IScreen>.StackNavigation
{
private IPostCommentsViewModelFactory postCommentsViewModelFactory;

2
Samples/Stylet.Samples.TabNavigation/ShellViewModel.cs
View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace Stylet.Samples.TabNavigation
{
class ShellViewModel : Conductor<IScreen>.Collections.OneActive
class ShellViewModel : Conductor<IScreen>.Collection.OneActive
{
public ShellViewModel(Page1ViewModel page1, Page2ViewModel page2)
{

2
Stylet/ConductorAllActive.cs
View File

@ -10,7 +10,7 @@ namespace Stylet
{
public partial class Conductor<T>
{
public partial class Collections
public partial class Collection
{
/// <summary>
/// Conductor which has many items, all of which active at the same time

171
Stylet/ConductorNavigating.cs
View File

@ -8,106 +8,103 @@ namespace Stylet
{
public partial class Conductor<T>
{
public partial class Collections
{
/// <summary>
/// Stack-based navigation. A Conductor which has one active item, and a stack of previous items
/// </summary>
public class Navigation : ConductorBaseWithActiveItem<T>
public class StackNavigation : ConductorBaseWithActiveItem<T>
{
// We need to remove arbitrary items, so no Stack<T> here!
private List<T> history = new List<T>();
/// <summary>
/// Activate the given item. This deactivates the previous item, and pushes it onto the history stack
/// </summary>
/// <param name="item">Item to activate</param>
public override void ActivateItem(T item)
{
// We need to remove arbitrary items, so no Stack<T> here!
private List<T> history = new List<T>();
/// <summary>
/// Activate the given item. This deactivates the previous item, and pushes it onto the history stack
/// </summary>
/// <param name="item">Item to activate</param>
public override void ActivateItem(T item)
if (item != null && item.Equals(this.ActiveItem))
{
if (item != null && item.Equals(this.ActiveItem))
if (this.IsActive)
ScreenExtensions.TryActivate(this.ActiveItem);
}
else
{
if (this.ActiveItem != null)
this.history.Add(this.ActiveItem);
this.ChangeActiveItem(item, false);
}
}
/// <summary>
/// Deactivate the given item
/// </summary>
/// <param name="item">Item to deactivate</param>
public override void DeactivateItem(T item)
{
ScreenExtensions.TryDeactivate(item);
}
/// <summary>
/// Close the active item, and re-activate the top item in the history stack
/// </summary>
public void GoBack()
{
this.CloseItem(this.ActiveItem);
}
/// <summary>
/// Close and remove all items in the history stack, leaving the ActiveItem
/// </summary>
public void Clear()
{
foreach (var item in this.history)
this.CloseAndCleanUp(item);
this.history.Clear();
}
/// <summary>
/// Close the given item. If it was the ActiveItem, activate the top item in the history stack
/// </summary>
/// <param name="item"></param>
public override async void CloseItem(T item)
{
if (item == null || !await this.CanCloseItem(item))
return;
if (item.Equals(this.ActiveItem))
{
var newItem = default(T);
if (this.history.Count > 0)
{
if (this.IsActive)
ScreenExtensions.TryActivate(this.ActiveItem);
}
else
{
if (this.ActiveItem != null)
this.history.Add(this.ActiveItem);
this.ChangeActiveItem(item, false);
newItem = this.history.Last();
this.history.RemoveAt(this.history.Count - 1);
}
this.ChangeActiveItem(newItem, true);
}
/// <summary>
/// Deactivate the given item
/// </summary>
/// <param name="item">Item to deactivate</param>
public override void DeactivateItem(T item)
else if (this.history.Contains(item))
{
ScreenExtensions.TryDeactivate(item);
this.CloseAndCleanUp(item);
this.history.Remove(item);
}
}
/// <summary>
/// Close the active item, and re-activate the top item in the history stack
/// </summary>
public void GoBack()
{
this.CloseItem(this.ActiveItem);
}
/// <summary>
/// Returns true if and when all items (ActiveItem + everything in the history stack) can close
/// </summary>
/// <returns></returns>
public override Task<bool> CanCloseAsync()
{
return this.CanAllItemsCloseAsync(this.history.Concat(new[] { this.ActiveItem }));
}
/// <summary>
/// Close and remove all items in the history stack, leaving the ActiveItem
/// </summary>
public void Clear()
{
foreach (var item in this.history)
this.CloseAndCleanUp(item);
this.history.Clear();
}
protected override void OnClose()
{
// We've already been deactivated by this point
foreach (var item in this.history)
this.CloseAndCleanUp(item);
this.history.Clear();
/// <summary>
/// Close the given item. If it was the ActiveItem, activate the top item in the history stack
/// </summary>
/// <param name="item"></param>
public override async void CloseItem(T item)
{
if (item == null || !await this.CanCloseItem(item))
return;
if (item.Equals(this.ActiveItem))
{
var newItem = default(T);
if (this.history.Count > 0)
{
newItem = this.history.Last();
this.history.RemoveAt(this.history.Count-1);
}
this.ChangeActiveItem(newItem, true);
}
else if (this.history.Contains(item))
{
this.CloseAndCleanUp(item);
this.history.Remove(item);
}
}
/// <summary>
/// Returns true if and when all items (ActiveItem + everything in the history stack) can close
/// </summary>
/// <returns></returns>
public override Task<bool> CanCloseAsync()
{
return this.CanAllItemsCloseAsync(this.history.Concat(new[] { this.ActiveItem }));
}
protected override void OnClose()
{
// We've already been deactivated by this point
foreach (var item in this.history)
this.CloseAndCleanUp(item);
this.history.Clear();
this.CloseAndCleanUp(this.ActiveItem);
}
this.CloseAndCleanUp(this.ActiveItem);
}
}
}

2
Stylet/ConductorOneActive.cs
View File

@ -10,7 +10,7 @@ namespace Stylet
{
public partial class Conductor<T>
{
public partial class Collections
public partial class Collection
{
/// <summary>
/// Conductor with many items, only one of which is active

4
StyletUnitTests/ConductorAllActiveTests.cs
View File

@ -12,12 +12,12 @@ namespace StyletUnitTests
[TestFixture]
public class ConductorAllActiveTests
{
private Conductor<IScreen>.Collections.AllActive conductor;
private Conductor<IScreen>.Collection.AllActive conductor;
[SetUp]
public void SetUp()
{
this.conductor = new Conductor<IScreen>.Collections.AllActive();
this.conductor = new Conductor<IScreen>.Collection.AllActive();
}
[Test]

4
StyletUnitTests/ConductorNavigatingTests.cs
View File

@ -12,12 +12,12 @@ namespace StyletUnitTests
[TestFixture]
public class ConductorNavigatingTests
{
private Conductor<IScreen>.Collections.Navigation conductor;
private Conductor<IScreen>.StackNavigation conductor;
[SetUp]
public void SetUp()
{
this.conductor = new Conductor<IScreen>.Collections.Navigation();
this.conductor = new Conductor<IScreen>.StackNavigation();
}
[Test]

4
StyletUnitTests/ConductorOneActiveTests.cs
View File

@ -12,12 +12,12 @@ namespace StyletUnitTests
[TestFixture]
public class ConductorOneActiveTests
{
private Conductor<IScreen>.Collections.OneActive conductor;
private Conductor<IScreen>.Collection.OneActive conductor;
[SetUp]
public void SetUp()
{
this.conductor = new Conductor<IScreen>.Collections.OneActive();
this.conductor = new Conductor<IScreen>.Collection.OneActive();
}
[Test]