Merge pull request PrismLibrary#1779 from PrismLibrary/IInitialize

[BREAKING] Implements IInitialize
Andrew-Rominger · Apr 25, 2019 · ae667e7 · ae667e7
2 parents a1d383d + d654987
commit ae667e7
Show file tree

Hide file tree

Showing 41 changed files with 288 additions and 141 deletions.
diff --git a/Source/Prism.Tests/Prism.Tests.csproj b/Source/Prism.Tests/Prism.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

diff --git a/Source/Prism/Navigation/INavigatedAwareAsync.cs b/Source/Prism/Navigation/INavigatedAwareAsync.cs
diff --git a/Source/Prism/Prism.csproj b/Source/Prism/Prism.csproj
@@ -26,8 +26,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'netcoreapp3.0' " Remove="Navigation/**" />
-    <Compile Include="Navigation/IDestructible.cs" />
     <Compile Update="Properties\Resources.Designer.cs" DesignTime="True" AutoGen="True" DependentUpon="Resources.resx" />
     <EmbeddedResource Update="Properties\Resources.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Resources.Designer.cs" />
   </ItemGroup>

diff --git a/Source/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj b/Source/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="4.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="DryIoc.dll" Version="4.0.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

diff --git a/Source/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj b/Source/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="4.0.0" />
+    <PackageReference Include="DryIoc.dll" Version="4.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/Wpf/Prism.Ninject.Wpf.Tests/Prism.Ninject.Wpf.Tests.csproj b/Source/Wpf/Prism.Ninject.Wpf.Tests/Prism.Ninject.Wpf.Tests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

diff --git a/Source/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj b/Source/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="Moq" Version="4.10.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">

diff --git a/Source/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj b/Source/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj
@@ -32,7 +32,7 @@
     <Reference Include="System.Windows.Interactivity">
       <HintPath>..\System.Windows.Interactivity.dll</HintPath>
     </Reference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="Moq" Version="4.10.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">

diff --git a/Source/Xamarin/Prism.DI.Forms.Tests/Fixtures/PartialViewFixture.cs b/Source/Xamarin/Prism.DI.Forms.Tests/Fixtures/PartialViewFixture.cs
@@ -70,7 +70,7 @@ public async Task PartialViewSupportsINavigationAwareInterfaces()
             var layout = (StackLayout)page.Content;
             var partialView = (PartialView)layout.Children.FirstOrDefault(c => c is PartialView);
             var vm = (PartialViewModel)partialView.BindingContext;
-            Assert.Equal(1, vm.OnNavigatingToCalled);
+            Assert.Equal(1, vm.InitializeCalled);
             Assert.Equal(1, vm.OnNavigatedToCalled);
             Assert.Equal(0, vm.OnNavigatedFromCalled);
             Assert.Equal("Test", vm.SomeText);

diff --git a/Source/Xamarin/Prism.DI.Forms.Tests/Mocks/ViewModels/PartialViewModel.cs b/Source/Xamarin/Prism.DI.Forms.Tests/Mocks/ViewModels/PartialViewModel.cs
@@ -4,7 +4,7 @@
 
 namespace Prism.DI.Forms.Tests.Mocks.ViewModels
 {
-    public class PartialViewModel : BindableBase, INavigationAware
+    public class PartialViewModel : BindableBase, IInitialize, INavigationAware
     {
         private INavigationService _navigationService { get; }
 
@@ -23,7 +23,7 @@ public string SomeText
 
         public DelegateCommand NavigateCommand { get; }
 
-        public int OnNavigatingToCalled { get; private set; }
+        public int InitializeCalled { get; private set; }
 
         public int OnNavigatedToCalled { get; private set; }
 
@@ -34,10 +34,10 @@ private async void OnNavigateCommandExecuted()
             await _navigationService.NavigateAsync("/AutowireView");
         }
 
-        public void OnNavigatingTo(INavigationParameters parameters)
+        public void Initialize(INavigationParameters parameters)
         {
             SomeText = parameters.GetValue<string>("text");
-            OnNavigatingToCalled++;
+            InitializeCalled++;
         }
 
         public void OnNavigatedTo(INavigationParameters parameters)

diff --git a/Source/Xamarin/Prism.DryIoc.Forms.Tests/Prism.DryIoc.Forms.Tests.csproj b/Source/Xamarin/Prism.DryIoc.Forms.Tests/Prism.DryIoc.Forms.Tests.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="Xamarin.Forms" Version="3.6.0.220655" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Xamarin.Forms" Version="3.6.0.344457" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

diff --git a/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj b/Source/Xamarin/Prism.DryIoc.Forms/Prism.DryIoc.Forms.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="4.0.0" />
+    <PackageReference Include="DryIoc.dll" Version="4.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/Xamarin/Prism.Forms.Tests/Behaviors/EventToCommandBehaviorFixture.cs b/Source/Xamarin/Prism.Forms.Tests/Behaviors/EventToCommandBehaviorFixture.cs
@@ -54,7 +54,7 @@ public void Command_OrderOfExecution()
             };
             var listView = new ListView();
             listView.Behaviors.Add(behavior);
-            behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, commandParameter));
+            behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, commandParameter, 0));
             Assert.True(executedCommand);
         }
 
@@ -76,7 +76,7 @@ public void Command_Converter()
             };
             var listView = new ListView();
             listView.Behaviors.Add(behavior);
-            behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, item));
+            behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, item, 0));
             Assert.True(executedCommand);
         }
 
@@ -99,7 +99,7 @@ public void Command_ConverterWithConverterParameter()
             };
             var listView = new ListView();
             listView.Behaviors.Add(behavior);
-            behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, null));
+            behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, null, 0));
             Assert.True(executedCommand);
         }
 
@@ -121,7 +121,7 @@ public void Command_ExecuteWithParameter()
             };
             var listView = new ListView();
             listView.Behaviors.Add(behavior);
-            behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, null));
+            behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, null, 0));
             Assert.True(executedCommand);
         }
 
@@ -143,7 +143,7 @@ public void Command_EventArgsParameterPath()
             };
             var listView = new ListView();
             listView.Behaviors.Add(behavior);
-            behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, item));
+            behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, item, 0));
             Assert.True(executedCommand);
         }
 
@@ -189,7 +189,7 @@ public void Command_EventArgsParameterPath_Nested_When_ChildIsNull()
             };
             var listView = new ListView();
             listView.Behaviors.Add(behavior);
-            behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, null));
+            behavior.RaiseEvent(listView, new ItemTappedEventArgs(listView, null, 0));
             Assert.True(executedCommand);
         }
 

diff --git a/Source/Xamarin/Prism.Forms.Tests/Mocks/PageNavigationEvent.cs b/Source/Xamarin/Prism.Forms.Tests/Mocks/PageNavigationEvent.cs
@@ -2,7 +2,8 @@
 {
     public enum PageNavigationEvent
     {
-        OnNavigatingTo,
+        OnInitialized,
+        OnInitializedAsync,
         OnNavigatedFrom,
         OnNavigatedTo,
         Destroy

diff --git a/Source/Xamarin/Prism.Forms.Tests/Mocks/ViewModels/ViewModelBase.cs b/Source/Xamarin/Prism.Forms.Tests/Mocks/ViewModels/ViewModelBase.cs
@@ -1,18 +1,21 @@
 using System;
+using System.Threading.Tasks;
 using Prism.Mvvm;
 using Prism.Navigation;
 
 namespace Prism.Forms.Tests.Mocks.ViewModels
 {
-    public class ViewModelBase : BindableBase, INavigationAware, IDestructible, IPageNavigationEventRecordable
+    public class ViewModelBase : BindableBase, IInitialize, IInitializeAsync, INavigationAware, IDestructible, IPageNavigationEventRecordable
     {
         public INavigationParameters NavigatedToParameters { get; private set; }
         public INavigationParameters NavigatedFromParameters { get; private set; }
         public PageNavigationEventRecorder PageNavigationEventRecorder { get; set; }
 
         public bool OnNavigatedToCalled { get; private set; } = false;
 
-        public bool OnNavigatingdToCalled { get; private set; } = false;
+        public bool InitializeCalled { get; private set; } = false;
+
+        public bool InitializeAsyncCalled { get; private set; } = false;
 
         public bool OnNavigatedFromCalled { get; private set; } = false;
 
@@ -32,11 +35,17 @@ public void OnNavigatedTo(INavigationParameters parameters)
             PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnNavigatedTo);
         }
 
-        public void OnNavigatingTo(INavigationParameters parameters)
+        public void Initialize(INavigationParameters parameters)
         {
-            OnNavigatingdToCalled = true;
-            NavigatedToParameters = parameters;
-            PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnNavigatingTo);
+            InitializeCalled = true;
+            PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnInitialized);
+        }
+
+        public Task InitializeAsync(INavigationParameters parameters)
+        {
+            InitializeAsyncCalled = true;
+            PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnInitializedAsync);
+            return Task.CompletedTask;
         }
 
         public void Destroy()

diff --git a/Source/Xamarin/Prism.Forms.Tests/Mocks/Views/ContentPageMock.cs b/Source/Xamarin/Prism.Forms.Tests/Mocks/Views/ContentPageMock.cs
@@ -6,12 +6,13 @@
 
 namespace Prism.Forms.Tests.Mocks.Views
 {
-    public class ContentPageMock : ContentPage, INavigationAware, IConfirmNavigationAsync, IDestructible, IPageNavigationEventRecordable
+    public class ContentPageMock : ContentPage, IInitialize, IInitializeAsync, INavigationAware, IConfirmNavigationAsync, IDestructible, IPageNavigationEventRecordable
     {
         public PageNavigationEventRecorder PageNavigationEventRecorder { get; set; }
         public bool OnNavigatedToCalled { get; private set; } = false;
         public bool OnNavigatedFromCalled { get; private set; } = false;
-        public bool OnNavigatingToCalled { get; private set; } = false;
+        public bool InitializeCalled { get; private set; } = false;
+        public bool InitializeAsyncCalled { get; private set; } = false;
 
         public bool OnConfirmNavigationCalled { get; private set; } = false;
 
@@ -41,10 +42,17 @@ public void OnNavigatedTo(INavigationParameters parameters)
             PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnNavigatedTo);
         }
 
-        public void OnNavigatingTo(INavigationParameters parameters)
+        public void Initialize(INavigationParameters parameters)
         {
-            OnNavigatingToCalled = true;
-            PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnNavigatingTo);
+            InitializeCalled = true;
+            PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnInitialized);
+        }
+
+        public Task InitializeAsync(INavigationParameters parameters)
+        {
+            InitializeAsyncCalled = true;
+            PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnInitializedAsync);
+            return Task.CompletedTask;
         }
 
         public Task<bool> CanNavigateAsync(INavigationParameters parameters)

diff --git a/Source/Xamarin/Prism.Forms.Tests/Mocks/Views/NavigationPageMock.cs b/Source/Xamarin/Prism.Forms.Tests/Mocks/Views/NavigationPageMock.cs
@@ -5,7 +5,7 @@
 
 namespace Prism.Forms.Tests.Mocks.Views
 {
-    public class NavigationPageMock : NavigationPage, IDestructible, IPageNavigationEventRecordable, INavigationPageOptions, INavigationAware
+    public class NavigationPageMock : NavigationPage, IDestructible, IPageNavigationEventRecordable, INavigationPageOptions, IInitialize, INavigationAware
     {
         public bool DestroyCalled { get; private set; } = false;
         public PageNavigationEventRecorder PageNavigationEventRecorder { get; set; }
@@ -43,9 +43,9 @@ public void OnNavigatedTo(INavigationParameters parameters)
             PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnNavigatedTo);
         }
 
-        public void OnNavigatingTo(INavigationParameters parameters)
+        public void Initialize(INavigationParameters parameters)
         {
-            PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnNavigatingTo);
+            PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnInitialized);
         }
     }
 
@@ -77,7 +77,7 @@ public void OnNavigatedTo(INavigationParameters parameters)
 
         public void OnNavigatingTo(INavigationParameters parameters)
         {
-            PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnNavigatingTo);
+            PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnInitialized);
         }
 
         public Task<bool> CanNavigateAsync(INavigationParameters parameters)

diff --git a/Source/Xamarin/Prism.Forms.Tests/Mocks/Views/PageMock.cs b/Source/Xamarin/Prism.Forms.Tests/Mocks/Views/PageMock.cs
@@ -5,7 +5,7 @@
 
 namespace Prism.Forms.Tests.Mocks.Views
 {
-    public class PageMock : Page, INavigationAware, IConfirmNavigationAsync, IDestructible, IPageNavigationEventRecordable
+    public class PageMock : Page, IInitialize, INavigationAware, IConfirmNavigationAsync, IDestructible, IPageNavigationEventRecordable
     {
         public PageNavigationEventRecorder PageNavigationEventRecorder { get; set; }
 
@@ -29,9 +29,9 @@ public void OnNavigatedTo(INavigationParameters parameters)
             PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnNavigatedTo);
         }
 
-        public void OnNavigatingTo(INavigationParameters parameters)
+        public void Initialize(INavigationParameters parameters)
         {
-            PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnNavigatingTo);
+            PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnInitialized);
         }
 
         public Task<bool> CanNavigateAsync(INavigationParameters parameters)

diff --git a/Source/Xamarin/Prism.Forms.Tests/Mocks/Views/TabbedPageMock.cs b/Source/Xamarin/Prism.Forms.Tests/Mocks/Views/TabbedPageMock.cs
@@ -5,7 +5,7 @@
 
 namespace Prism.Forms.Tests.Mocks.Views
 {
-    public class TabbedPageMock : TabbedPage, IDestructible, INavigationAware, IPageNavigationEventRecordable
+    public class TabbedPageMock : TabbedPage, IDestructible, IInitialize, INavigationAware, IPageNavigationEventRecordable
     {
         public bool DestroyCalled { get; private set; } = false;
         public PageNavigationEventRecorder PageNavigationEventRecorder { get; set; }
@@ -48,9 +48,9 @@ public void OnNavigatedTo(INavigationParameters parameters)
             PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnNavigatedTo);
         }
 
-        public void OnNavigatingTo(INavigationParameters parameters)
+        public void Initialize(INavigationParameters parameters)
         {
-            PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnNavigatingTo);
+            PageNavigationEventRecorder?.Record(this, PageNavigationEvent.OnInitialized);
         }
     }
 }