diff --git a/e2e/Forms/src/HelloRegions/ViewModels/CarouselDemoRegionViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/CarouselDemoRegionViewModel.cs index c81144a1ff35ff7620cacbd8f0494d79317f6203..73286f9d2c5360f31160097ccca9052fd4ca0dd7 100644 --- a/e2e/Forms/src/HelloRegions/ViewModels/CarouselDemoRegionViewModel.cs +++ b/e2e/Forms/src/HelloRegions/ViewModels/CarouselDemoRegionViewModel.cs @@ -1,4 +1,4 @@ -using Prism.Regions; +using Prism.Navigation.Regions; namespace HelloRegions.ViewModels { diff --git a/e2e/Forms/src/HelloRegions/ViewModels/CollectionViewDemoRegionViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/CollectionViewDemoRegionViewModel.cs index 0418ed476e12f05631795e8a8fd3e8eee98ab582..16e23acee98caa99fe53cab11e276159dd3f0803 100644 --- a/e2e/Forms/src/HelloRegions/ViewModels/CollectionViewDemoRegionViewModel.cs +++ b/e2e/Forms/src/HelloRegions/ViewModels/CollectionViewDemoRegionViewModel.cs @@ -1,4 +1,4 @@ -using Prism.Regions; +using Prism.Navigation.Regions; namespace HelloRegions.ViewModels { diff --git a/e2e/Forms/src/HelloRegions/ViewModels/ContentViewDemoRegionViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/ContentViewDemoRegionViewModel.cs index 5b171ec8fc430a0a38dd548a06d48dd6eb3b13e3..ab4266b9aa8c700cec4a2c8c8cd4662abef789d0 100644 --- a/e2e/Forms/src/HelloRegions/ViewModels/ContentViewDemoRegionViewModel.cs +++ b/e2e/Forms/src/HelloRegions/ViewModels/ContentViewDemoRegionViewModel.cs @@ -1,4 +1,4 @@ -using Prism.Regions; +using Prism.Navigation.Regions; namespace HelloRegions.ViewModels { diff --git a/e2e/Forms/src/HelloRegions/ViewModels/FlexLayoutDemoRegionViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/FlexLayoutDemoRegionViewModel.cs index 91c2c0e6f6e410d9cfd30d5914a36e497256dbbf..ff8110715112c8563580776d0c34723cace5b79c 100644 --- a/e2e/Forms/src/HelloRegions/ViewModels/FlexLayoutDemoRegionViewModel.cs +++ b/e2e/Forms/src/HelloRegions/ViewModels/FlexLayoutDemoRegionViewModel.cs @@ -1,4 +1,4 @@ -using Prism.Regions; +using Prism.Navigation.Regions; namespace HelloRegions.ViewModels { diff --git a/e2e/Forms/src/HelloRegions/ViewModels/FrameDemoRegionViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/FrameDemoRegionViewModel.cs index 94bc895308f942044eb022800bcf35b923ed5c60..91a85f4e9a7f00a880bd45dfcad80fbb215dd66e 100644 --- a/e2e/Forms/src/HelloRegions/ViewModels/FrameDemoRegionViewModel.cs +++ b/e2e/Forms/src/HelloRegions/ViewModels/FrameDemoRegionViewModel.cs @@ -1,4 +1,4 @@ -using Prism.Regions; +using Prism.Navigation.Regions; namespace HelloRegions.ViewModels { diff --git a/e2e/Forms/src/HelloRegions/ViewModels/RegionAViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/RegionAViewModel.cs index 75531b16a904841a33bc897170a93630a57f26a1..9b291c5a96972212a91af71e6bb2fdb83403e05b 100644 --- a/e2e/Forms/src/HelloRegions/ViewModels/RegionAViewModel.cs +++ b/e2e/Forms/src/HelloRegions/ViewModels/RegionAViewModel.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using System.Windows.Input; using Prism.Commands; using Prism.Navigation; -using Prism.Regions.Navigation; +using Prism.Navigation.Regions.Navigation; namespace HelloRegions.ViewModels { diff --git a/e2e/Forms/src/HelloRegions/ViewModels/RegionBViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/RegionBViewModel.cs index 6bd547395f4937cd6d8462f1e4ce39846375d2d3..8f229dba0ab779211b130f184941384d9ed4922c 100644 --- a/e2e/Forms/src/HelloRegions/ViewModels/RegionBViewModel.cs +++ b/e2e/Forms/src/HelloRegions/ViewModels/RegionBViewModel.cs @@ -1,4 +1,4 @@ -using Prism.Regions.Navigation; +using Prism.Navigation.Regions.Navigation; namespace HelloRegions.ViewModels { diff --git a/e2e/Forms/src/HelloRegions/ViewModels/RegionCViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/RegionCViewModel.cs index 220bac4ed6837cc4cb6bc12fac5d23cc8f5c5bc5..102c68e3d7b019a44a5ca4d477e155dc5eecd7e5 100644 --- a/e2e/Forms/src/HelloRegions/ViewModels/RegionCViewModel.cs +++ b/e2e/Forms/src/HelloRegions/ViewModels/RegionCViewModel.cs @@ -1,4 +1,4 @@ -using Prism.Regions.Navigation; +using Prism.Navigation.Regions.Navigation; namespace HelloRegions.ViewModels { diff --git a/e2e/Forms/src/HelloRegions/ViewModels/RegionDemoBase.cs b/e2e/Forms/src/HelloRegions/ViewModels/RegionDemoBase.cs index 0d0bfd46b64de8c930f3bbb7e01fcc0a9117f2d3..2cc51cf611d43eb1f114400e7dcf334c74fa5640 100644 --- a/e2e/Forms/src/HelloRegions/ViewModels/RegionDemoBase.cs +++ b/e2e/Forms/src/HelloRegions/ViewModels/RegionDemoBase.cs @@ -2,8 +2,8 @@ using System; using Prism.Commands; using Prism.Mvvm; using Prism.Navigation; -using Prism.Regions; -using Prism.Regions.Navigation; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Navigation; namespace HelloRegions.ViewModels { diff --git a/e2e/Forms/src/HelloRegions/ViewModels/ScrollViewDemoRegionViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/ScrollViewDemoRegionViewModel.cs index d22bb75c6351c26a6e1d06471d35032c36b5e636..92499b059f356d3b8d91bd05ab6e3ba5e5b1ab33 100644 --- a/e2e/Forms/src/HelloRegions/ViewModels/ScrollViewDemoRegionViewModel.cs +++ b/e2e/Forms/src/HelloRegions/ViewModels/ScrollViewDemoRegionViewModel.cs @@ -1,4 +1,4 @@ -using Prism.Regions; +using Prism.Navigation.Regions; namespace HelloRegions.ViewModels { diff --git a/e2e/Forms/src/HelloRegions/ViewModels/StackLayoutDemoRegionViewModel.cs b/e2e/Forms/src/HelloRegions/ViewModels/StackLayoutDemoRegionViewModel.cs index 4faa8db136b2c2d8a68bb746396b3c2e05a4984a..76cf0843843450fe6456b7e374e4c7082dba8bd8 100644 --- a/e2e/Forms/src/HelloRegions/ViewModels/StackLayoutDemoRegionViewModel.cs +++ b/e2e/Forms/src/HelloRegions/ViewModels/StackLayoutDemoRegionViewModel.cs @@ -1,4 +1,4 @@ -using Prism.Regions; +using Prism.Navigation.Regions; namespace HelloRegions.ViewModels { diff --git a/e2e/Forms/src/HelloRegions/ViewModels/ViewModelBase.cs b/e2e/Forms/src/HelloRegions/ViewModels/ViewModelBase.cs index 442730a26151d8e4d567554f59ccbd6b1bf96eb2..8e179a3b729fba5f7ee1ecb78e6a6d721c7f4e66 100644 --- a/e2e/Forms/src/HelloRegions/ViewModels/ViewModelBase.cs +++ b/e2e/Forms/src/HelloRegions/ViewModels/ViewModelBase.cs @@ -1,7 +1,7 @@ using System; using Prism.Commands; using Prism.Mvvm; -using Prism.Regions.Navigation; +using Prism.Navigation.Regions.Navigation; namespace HelloRegions.ViewModels { diff --git a/e2e/Wpf/HelloWorld/ViewModels/MainWindowViewModel.cs b/e2e/Wpf/HelloWorld/ViewModels/MainWindowViewModel.cs index 7d2d6498907887813a21ac95e268f2d01ee67c34..85dd65a26f5fe340cd1f77462c6841c339f57e85 100644 --- a/e2e/Wpf/HelloWorld/ViewModels/MainWindowViewModel.cs +++ b/e2e/Wpf/HelloWorld/ViewModels/MainWindowViewModel.cs @@ -2,7 +2,7 @@ using HelloWorld.Core; using Prism.Commands; using Prism.Mvvm; -using Prism.Regions; +using Prism.Navigation.Regions; using Prism.Dialogs; namespace HelloWorld.ViewModels @@ -35,7 +35,7 @@ namespace HelloWorld.ViewModels { _dialogService = dialogService; _regionManager = regionManager; - ShowDialogCommand = new DelegateCommand(ShowDialog); + ShowDialogCommand = new DelegateCommand(ShowDialog); } private void ShowDialog() diff --git a/src/Forms/Prism.Forms.Regions/Behaviors/RegionCleanupBehavior.cs b/src/Forms/Prism.Forms.Regions/Behaviors/RegionCleanupBehavior.cs index 4b66c04a5ba2672623a7956812c241d3e43484d6..7243c0ca663170f68add4131b0228acf139b1dec 100644 --- a/src/Forms/Prism.Forms.Regions/Behaviors/RegionCleanupBehavior.cs +++ b/src/Forms/Prism.Forms.Regions/Behaviors/RegionCleanupBehavior.cs @@ -1,6 +1,6 @@ using System; using Prism.Ioc; -using Prism.Regions; +using Prism.Navigation.Regions; using Xamarin.Forms; namespace Prism.Behaviors diff --git a/src/Forms/Prism.Forms.Regions/Common/MvvmHelpers.cs b/src/Forms/Prism.Forms.Regions/Common/MvvmHelpers.cs index b944a862808b4cf2fbdeaf0ee966196502049df7..048ab9aba17e0138b39a5130ffec8d55a0f2af4a 100644 --- a/src/Forms/Prism.Forms.Regions/Common/MvvmHelpers.cs +++ b/src/Forms/Prism.Forms.Regions/Common/MvvmHelpers.cs @@ -1,5 +1,5 @@ using System; -using Prism.Regions; +using Prism.Navigation.Regions; using Xamarin.Forms; namespace Prism.Common diff --git a/src/Forms/Prism.Forms.Regions/Ioc/RegionRegistrationExtensions.cs b/src/Forms/Prism.Forms.Regions/Ioc/RegionRegistrationExtensions.cs index eb64c8b4b6fff6fdf7e86643a23af83acdad5de4..0d47e34c5edaed4ccd4bea41b5bc125243e853b2 100644 --- a/src/Forms/Prism.Forms.Regions/Ioc/RegionRegistrationExtensions.cs +++ b/src/Forms/Prism.Forms.Regions/Ioc/RegionRegistrationExtensions.cs @@ -1,8 +1,9 @@ using System; -using Prism.Regions; -using Prism.Regions.Adapters; -using Prism.Regions.Behaviors; -using Prism.Regions.Navigation; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Adapters; +using Prism.Navigation.Regions.Behaviors; +using Prism.Navigation.Regions.Navigation; +using Prism.Navigation.Regions; using Xamarin.Forms; namespace Prism.Ioc diff --git a/src/Forms/Prism.Forms.Regions/Ioc/RegionResolverOverrides.cs b/src/Forms/Prism.Forms.Regions/Ioc/RegionResolverOverrides.cs index a4d3577988ca4b0d2e527f525cbbd12363d8eb34..a019f619bcd960ba24c68edb333252e12279c071 100644 --- a/src/Forms/Prism.Forms.Regions/Ioc/RegionResolverOverrides.cs +++ b/src/Forms/Prism.Forms.Regions/Ioc/RegionResolverOverrides.cs @@ -1,7 +1,8 @@ using System; using System.Collections.Generic; using Prism.Navigation; -using Prism.Regions; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions; namespace Prism.Ioc { diff --git a/src/Forms/Prism.Forms.Regions/Regions/Adapters/CarouselViewRegionAdapter.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/CarouselViewRegionAdapter.cs similarity index 96% rename from src/Forms/Prism.Forms.Regions/Regions/Adapters/CarouselViewRegionAdapter.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/CarouselViewRegionAdapter.cs index 4ec03671111ba41f7e79350b1e14d3dd5563814b..c992b4d2e4de9fd2979583248cf07876c1b2e615 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Adapters/CarouselViewRegionAdapter.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/CarouselViewRegionAdapter.cs @@ -1,18 +1,13 @@ using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; using Prism.Behaviors; using Prism.Common; using Prism.Ioc; -using Prism.Navigation; using Prism.Properties; -using Prism.Regions.Behaviors; -using Prism.Regions.Navigation; using Xamarin.Forms; -namespace Prism.Regions.Adapters +namespace Prism.Navigation.Regions.Adapters { /// /// Adapter that creates a new and monitors its diff --git a/src/Forms/Prism.Forms.Regions/Regions/Adapters/CollectionViewRegionAdapter.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/CollectionViewRegionAdapter.cs similarity index 97% rename from src/Forms/Prism.Forms.Regions/Regions/Adapters/CollectionViewRegionAdapter.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/CollectionViewRegionAdapter.cs index a3a507879a3e179f5033e47b41d425b57c5a0839..7c408181e7eddb378bd3607306fc67d6ad791593 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Adapters/CollectionViewRegionAdapter.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/CollectionViewRegionAdapter.cs @@ -1,10 +1,9 @@ using System; using Prism.Ioc; using Prism.Properties; -using Prism.Regions.Behaviors; using Xamarin.Forms; -namespace Prism.Regions.Adapters +namespace Prism.Navigation.Regions.Adapters { /// /// Adapter that creates a new and monitors its diff --git a/src/Forms/Prism.Forms.Regions/Regions/Adapters/ContentViewRegionAdapter.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/ContentViewRegionAdapter.cs similarity index 98% rename from src/Forms/Prism.Forms.Regions/Regions/Adapters/ContentViewRegionAdapter.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/ContentViewRegionAdapter.cs index dfe0b539db126f4158ce603ce85b237513da1aae..a47e7c062c13b35d909340a5c758db6fdca2de12 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Adapters/ContentViewRegionAdapter.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/ContentViewRegionAdapter.cs @@ -3,10 +3,9 @@ using System.Collections.Specialized; using System.Linq; using Prism.Ioc; using Prism.Properties; -using Prism.Regions.Behaviors; using Xamarin.Forms; -namespace Prism.Regions.Adapters +namespace Prism.Navigation.Regions.Adapters { /// /// Adapter that creates a new and monitors its diff --git a/src/Forms/Prism.Forms.Regions/Regions/Adapters/LayoutViewRegionAdapter.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/LayoutViewRegionAdapter.cs similarity index 97% rename from src/Forms/Prism.Forms.Regions/Regions/Adapters/LayoutViewRegionAdapter.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/LayoutViewRegionAdapter.cs index a7fa31315dee1c19b02e296d41efcc397da6840b..c1bf7237ef2fdba785ff3f97e18df21470348c09 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Adapters/LayoutViewRegionAdapter.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/LayoutViewRegionAdapter.cs @@ -2,10 +2,9 @@ using System.Linq; using Prism.Ioc; using Prism.Properties; -using Prism.Regions.Behaviors; using Xamarin.Forms; -namespace Prism.Regions.Adapters +namespace Prism.Navigation.Regions.Adapters { /// /// Adapter that creates a new and monitors its diff --git a/src/Forms/Prism.Forms.Regions/Regions/Adapters/RegionAdapterBase.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/RegionAdapterBase.cs similarity index 98% rename from src/Forms/Prism.Forms.Regions/Regions/Adapters/RegionAdapterBase.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/RegionAdapterBase.cs index 7ca851c3df4cf71400199831ee0ed9f3cf03a60f..7f89095adcdfec958fc250e585e77043444370e4 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Adapters/RegionAdapterBase.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/RegionAdapterBase.cs @@ -1,10 +1,10 @@ using System; using System.Globalization; +using Prism.Navigation.Regions.Behaviors; using Prism.Properties; -using Prism.Regions.Behaviors; using Xamarin.Forms; -namespace Prism.Regions.Adapters +namespace Prism.Navigation.Regions.Adapters { /// /// Base class to facilitate the creation of implementations. diff --git a/src/Forms/Prism.Forms.Regions/Regions/Adapters/RegionAdapterMappings.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/RegionAdapterMappings.cs similarity index 99% rename from src/Forms/Prism.Forms.Regions/Regions/Adapters/RegionAdapterMappings.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/RegionAdapterMappings.cs index fcfb9854189cd7468422be1b0f9e9a94c062bfa7..4a4fedc19a94f92aaa3ec5616f208edc481e230e 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Adapters/RegionAdapterMappings.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/RegionAdapterMappings.cs @@ -4,7 +4,7 @@ using System.Globalization; using Prism.Ioc; using Prism.Properties; -namespace Prism.Regions.Adapters +namespace Prism.Navigation.Regions.Adapters { /// /// This class maps with . diff --git a/src/Forms/Prism.Forms.Regions/Regions/Adapters/RegionItemsSourceTemplate.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/RegionItemsSourceTemplate.cs similarity index 94% rename from src/Forms/Prism.Forms.Regions/Regions/Adapters/RegionItemsSourceTemplate.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/RegionItemsSourceTemplate.cs index 1fdb366588819f196fff4c12aba195c42a6ba9b9..b765baf2c3154fd128b970dea2cabaae8ad79a2f 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Adapters/RegionItemsSourceTemplate.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/RegionItemsSourceTemplate.cs @@ -1,6 +1,6 @@ using Xamarin.Forms; -namespace Prism.Regions.Adapters +namespace Prism.Navigation.Regions.Adapters { // Implementation Note: // In discussing with PureWeen, it is best to provide a ContentView and provide a diff --git a/src/Forms/Prism.Forms.Regions/Regions/Adapters/ScrollViewRegionAdapter.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/ScrollViewRegionAdapter.cs similarity index 97% rename from src/Forms/Prism.Forms.Regions/Regions/Adapters/ScrollViewRegionAdapter.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/ScrollViewRegionAdapter.cs index 9ebf83429748e1e1bb6178efed6b49f91164e7c7..8836c44f84f8c0d2bfa86d178a7c137037b4da2b 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Adapters/ScrollViewRegionAdapter.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Adapters/ScrollViewRegionAdapter.cs @@ -3,10 +3,9 @@ using System.Collections.Specialized; using System.Linq; using Prism.Ioc; using Prism.Properties; -using Prism.Regions.Behaviors; using Xamarin.Forms; -namespace Prism.Regions.Adapters +namespace Prism.Navigation.Regions.Adapters { /// /// Adapter that creates a new and monitors its diff --git a/src/Forms/Prism.Forms.Regions/Regions/AllActiveRegion.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/AllActiveRegion.cs similarity index 96% rename from src/Forms/Prism.Forms.Regions/Regions/AllActiveRegion.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/AllActiveRegion.cs index eb56fc001fd37a40e5e19eefcb7965c0edf19756..4f43a6ade19d7eadcf4075d69308110a09aa2d34 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/AllActiveRegion.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/AllActiveRegion.cs @@ -1,7 +1,7 @@ using System; using Prism.Properties; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Region that keeps all the views in it as active. Deactivation of views is not allowed. diff --git a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/AutoPopulateRegionBehavior.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/AutoPopulateRegionBehavior.cs similarity index 98% rename from src/Forms/Prism.Forms.Regions/Regions/Behaviors/AutoPopulateRegionBehavior.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/AutoPopulateRegionBehavior.cs index 51c4496df3a447b370a01602f8f6f0846b3c8a47..fc7d5073722a9178f1c207351a292d470f5f81af 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/AutoPopulateRegionBehavior.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/AutoPopulateRegionBehavior.cs @@ -4,7 +4,7 @@ using System.ComponentModel; using Prism.Ioc; using Xamarin.Forms; -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Populates the target region with the views registered to it in the . diff --git a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/BindRegionContextToVisualElementBehavior.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/BindRegionContextToVisualElementBehavior.cs similarity index 97% rename from src/Forms/Prism.Forms.Regions/Regions/Behaviors/BindRegionContextToVisualElementBehavior.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/BindRegionContextToVisualElementBehavior.cs index e84320712d100582156d6f8560eed8d8a71acec7..a1137913a9b24ec2c1bc0fee75b65a656b7cabef 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/BindRegionContextToVisualElementBehavior.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/BindRegionContextToVisualElementBehavior.cs @@ -4,10 +4,10 @@ using System.ComponentModel; using Prism.Common; using Xamarin.Forms; -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// - /// Defines a behavior that forwards the + /// Defines a behavior that forwards the /// to the views in the region. /// public class BindRegionContextToVisualElementBehavior : IRegionBehavior diff --git a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/ClearChildViewsRegionBehavior.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/ClearChildViewsRegionBehavior.cs similarity index 88% rename from src/Forms/Prism.Forms.Regions/Regions/Behaviors/ClearChildViewsRegionBehavior.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/ClearChildViewsRegionBehavior.cs index 66528d71ce5df111fce1447145c5cdb5c3c5531d..70b3a9448b9998267d5bfebba707ea83e728d4b0 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/ClearChildViewsRegionBehavior.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/ClearChildViewsRegionBehavior.cs @@ -2,7 +2,7 @@ using System.Linq; using Xamarin.Forms; -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Behavior that removes the RegionManager attached property of all the views in a region once the RegionManager property of a region becomes null. @@ -35,7 +35,7 @@ namespace Prism.Regions.Behaviors if (target == null) throw new ArgumentNullException(nameof(target)); - return (bool)target.GetValue(ClearChildViewsRegionBehavior.ClearChildViewsProperty); + return (bool)target.GetValue(ClearChildViewsProperty); } /// @@ -48,7 +48,7 @@ namespace Prism.Regions.Behaviors if (target == null) throw new ArgumentNullException(nameof(target)); - target.SetValue(ClearChildViewsRegionBehavior.ClearChildViewsProperty, value); + target.SetValue(ClearChildViewsProperty, value); } /// @@ -56,7 +56,7 @@ namespace Prism.Regions.Behaviors /// protected override void OnAttach() { - this.Region.PropertyChanged += Region_PropertyChanged; + Region.PropertyChanged += Region_PropertyChanged; } private static void ClearChildViews(IRegion region) @@ -74,9 +74,9 @@ namespace Prism.Regions.Behaviors { if (e.PropertyName == "RegionManager") { - if (this.Region.RegionManager == null) + if (Region.RegionManager == null) { - ClearChildViews(this.Region); + ClearChildViews(Region); } } } diff --git a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/DelayedRegionCreationBehavior.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/DelayedRegionCreationBehavior.cs similarity index 96% rename from src/Forms/Prism.Forms.Regions/Regions/Behaviors/DelayedRegionCreationBehavior.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/DelayedRegionCreationBehavior.cs index 56d4080f5e2ab4c497193f6f4a29116b4a52fa0a..6104d86baa7e0d03590710658efc438506fe79d1 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/DelayedRegionCreationBehavior.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/DelayedRegionCreationBehavior.cs @@ -5,11 +5,11 @@ using System.ComponentModel; using System.Globalization; using Prism.Behaviors; using Prism.Extensions; +using Prism.Navigation.Regions.Adapters; using Prism.Properties; -using Prism.Regions.Adapters; using Xamarin.Forms; -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Behavior that creates a new , when the control that will host the (see ) @@ -99,7 +99,7 @@ namespace Prism.Regions.Behaviors /// Called when the is updating it's collection. /// /// The . - /// The instance containing the event data. + /// The instance containing the event data. public void OnUpdatingRegions(object sender, EventArgs e) { TryCreateRegion(); @@ -153,7 +153,7 @@ namespace Prism.Regions.Behaviors page.Behaviors.Add(cleanupBehavior); if (region is INavigationServiceAware nsa) { - nsa.NavigationService = Prism.Navigation.Xaml.Navigation.GetNavigationService(page); + nsa.NavigationService = global::Prism.Navigation.Xaml.Navigation.GetNavigationService(page); } return region; diff --git a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/DestructibleRegionBehavior.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/DestructibleRegionBehavior.cs similarity index 94% rename from src/Forms/Prism.Forms.Regions/Regions/Behaviors/DestructibleRegionBehavior.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/DestructibleRegionBehavior.cs index b6bb31de228165b1425685e9d49832fd588ef926..ed561d6b10e4377526f487680a60068b0c878346 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/DestructibleRegionBehavior.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/DestructibleRegionBehavior.cs @@ -1,8 +1,7 @@ using System.Collections.Specialized; using Prism.Common; -using Prism.Navigation; -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Provides a Behavior to Destroy the View/ViewModel when the View is removed from the Region's Views diff --git a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/IHostAwareRegionBehavior.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/IHostAwareRegionBehavior.cs similarity index 94% rename from src/Forms/Prism.Forms.Regions/Regions/Behaviors/IHostAwareRegionBehavior.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/IHostAwareRegionBehavior.cs index 7f63dc7c775ff9aa6c113718d90525cf5c9bc5fc..dc983def108a0c023691f22d6f775fcb52f8c19f 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/IHostAwareRegionBehavior.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/IHostAwareRegionBehavior.cs @@ -1,6 +1,6 @@ using Xamarin.Forms; -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Defines a that not allows extensible behaviors on regions which also interact diff --git a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/RegionActiveAwareBehavior.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/RegionActiveAwareBehavior.cs similarity index 88% rename from src/Forms/Prism.Forms.Regions/Regions/Behaviors/RegionActiveAwareBehavior.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/RegionActiveAwareBehavior.cs index a1456d701496aef87be63806ae5c54ea66c02d0a..795f1f747ef03dce7934628c00bfc26280b9c530 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/RegionActiveAwareBehavior.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/RegionActiveAwareBehavior.cs @@ -4,17 +4,17 @@ using System.Linq; using Prism.Common; using Xamarin.Forms; -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// - /// Behavior that monitors a object and + /// Behavior that monitors a object and /// changes the value for the property when - /// an object that implements gets added or removed + /// an object that implements gets added or removed /// from the collection. /// /// /// This class can also sync the active state for any scoped regions directly on the view based on the . - /// If you use the method with the createRegionManagerScope option, the scoped manager will be attached to the view. + /// If you use the method with the createRegionManagerScope option, the scoped manager will be attached to the view. /// public class RegionActiveAwareBehavior : IRegionBehavior { @@ -33,7 +33,7 @@ namespace Prism.Regions.Behaviors /// public void Attach() { - INotifyCollectionChanged collection = this.GetCollection(); + INotifyCollectionChanged collection = GetCollection(); if (collection != null) { collection.CollectionChanged += OnCollectionChanged; @@ -45,7 +45,7 @@ namespace Prism.Regions.Behaviors /// public void Detach() { - INotifyCollectionChanged collection = this.GetCollection(); + INotifyCollectionChanged collection = GetCollection(); if (collection != null) { collection.CollectionChanged -= OnCollectionChanged; @@ -82,13 +82,13 @@ namespace Prism.Regions.Behaviors { if (item is VisualElement visualElement) { - // We are assuming that any scoped region managers are attached directly to the + // We are assuming that any scoped region managers are attached directly to the // view. var regionManager = Xaml.RegionManager.GetRegionManager(visualElement); // If the view's RegionManager attached property is different from the region's RegionManager, // then the view's region manager is a scoped region manager. - if (regionManager == null || regionManager == this.Region.RegionManager) return; + if (regionManager == null || regionManager == Region.RegionManager) return; var activeViews = regionManager.Regions.SelectMany(e => e.ActiveViews).OfType(); @@ -115,7 +115,7 @@ namespace Prism.Regions.Behaviors private INotifyCollectionChanged GetCollection() { - return this.Region.ActiveViews; + return Region.ActiveViews; } } } diff --git a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/RegionManagerRegistrationBehavior.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/RegionManagerRegistrationBehavior.cs similarity index 99% rename from src/Forms/Prism.Forms.Regions/Regions/Behaviors/RegionManagerRegistrationBehavior.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/RegionManagerRegistrationBehavior.cs index 37bca6f28e99e21fc234fafa66912307327172e2..be794e2567443df6cafa60f2f9c9a2f126b70df8 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/RegionManagerRegistrationBehavior.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/RegionManagerRegistrationBehavior.cs @@ -3,7 +3,7 @@ using System.ComponentModel; using Prism.Properties; using Xamarin.Forms; -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Subscribes to a static event from the in order to register the target diff --git a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/RegionMemberLifetimeBehavior.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/RegionMemberLifetimeBehavior.cs similarity index 97% rename from src/Forms/Prism.Forms.Regions/Regions/Behaviors/RegionMemberLifetimeBehavior.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/RegionMemberLifetimeBehavior.cs index 2bbab455e8662f3bb8d6ed8aa0bf692991b88250..ea1eec209de2ec0d23b255dfa46b145662b1cfb2 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/RegionMemberLifetimeBehavior.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/RegionMemberLifetimeBehavior.cs @@ -5,7 +5,7 @@ using System.Linq; using Prism.Common; using Xamarin.Forms; -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// The RegionMemberLifetimeBehavior determines if items should be removed from the @@ -13,10 +13,10 @@ namespace Prism.Regions.Behaviors /// /// /// The monitors the - /// collection to discover items that transition into a deactivated state. + /// collection to discover items that transition into a deactivated state. ///

/// The behavior checks the removed items for either the - /// or the (in that order) to determine if it should be kept + /// or the (in that order) to determine if it should be kept /// alive on removal. ///

/// If the item in the collection is a , it will diff --git a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs similarity index 92% rename from src/Forms/Prism.Forms.Regions/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs index d8ad59fdeed0e0eb08a9af9d2f5542272661f378..80d7608024ab1b7d649a584f659b0e44f05f5573 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs @@ -3,14 +3,14 @@ using Prism.Common; using Prism.Properties; using Xamarin.Forms; -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { ///

- /// Behavior that synchronizes the property of a with - /// the control that hosts the Region. It does this by setting the + /// Behavior that synchronizes the property of a with + /// the control that hosts the Region. It does this by setting the /// Dependency Property on the host control. - /// - /// This behavior allows the usage of two way databinding of the RegionContext from XAML. + /// + /// This behavior allows the usage of two way databinding of the RegionContext from XAML. /// public class SyncRegionContextWithHostBehavior : RegionBehavior, IHostAwareRegionBehavior { @@ -18,7 +18,7 @@ namespace Prism.Regions.Behaviors private VisualElement _hostControl; /// - /// Name that identifies the SyncRegionContextWithHostBehavior behavior in a collection of RegionsBehaviors. + /// Name that identifies the SyncRegionContextWithHostBehavior behavior in a collection of RegionsBehaviors. /// public static readonly string BehaviorKey = "SyncRegionContextWithHost"; @@ -54,7 +54,7 @@ namespace Prism.Regions.Behaviors { if (HostControl != null) { - // Sync values initially. + // Sync values initially. SynchronizeRegionContext(); // Now register for events to keep them in sync diff --git a/src/Forms/Prism.Forms.Regions/Regions/DefaultRegionManagerAccessor.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/DefaultRegionManagerAccessor.cs similarity index 98% rename from src/Forms/Prism.Forms.Regions/Regions/DefaultRegionManagerAccessor.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/DefaultRegionManagerAccessor.cs index 5402362485c809556ebb6cae4aef386fda1ba055..11a45305a6f606e09583778fc627fedf45d6dc60 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/DefaultRegionManagerAccessor.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/DefaultRegionManagerAccessor.cs @@ -2,7 +2,7 @@ using Prism.Ioc; using Xamarin.Forms; -namespace Prism.Regions +namespace Prism.Navigation.Regions { internal class DefaultRegionManagerAccessor : IRegionManagerAccessor { diff --git a/src/Forms/Prism.Forms.Regions/Regions/IActiveRegionHelper.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/IActiveRegionHelper.cs similarity index 72% rename from src/Forms/Prism.Forms.Regions/Regions/IActiveRegionHelper.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/IActiveRegionHelper.cs index 6685df2ba04622932762899cb893cb43a2779a0f..eb194ca987eb2a6ca177b73f80fd9c00c6c257ac 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/IActiveRegionHelper.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/IActiveRegionHelper.cs @@ -1,4 +1,4 @@ -namespace Prism.Regions +namespace Prism.Navigation.Regions { internal interface IActiveRegionHelper { diff --git a/src/Forms/Prism.Forms.Regions/Regions/INavigationServiceAware.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/INavigationServiceAware.cs similarity index 70% rename from src/Forms/Prism.Forms.Regions/Regions/INavigationServiceAware.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/INavigationServiceAware.cs index 9086796f6da0eba6f83f49657b7d7d83ba6b4269..d080839b14550f30c65ed7ebcfaa0dc1ab024b43 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/INavigationServiceAware.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/INavigationServiceAware.cs @@ -1,6 +1,4 @@ -using Prism.Navigation; - -namespace Prism.Regions +namespace Prism.Navigation.Regions { internal interface INavigationServiceAware { diff --git a/src/Forms/Prism.Forms.Regions/Regions/IRegionManagerAccessor.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/IRegionManagerAccessor.cs similarity index 96% rename from src/Forms/Prism.Forms.Regions/Regions/IRegionManagerAccessor.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/IRegionManagerAccessor.cs index 88a2bb394eac897abbda3f63afd95869ec34f3dd..525a7ee20c009a95e860a3c583a2d66425ad8aa5 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/IRegionManagerAccessor.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/IRegionManagerAccessor.cs @@ -1,7 +1,7 @@ using System; using Xamarin.Forms; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Provides an abstraction on top of the RegionManager static members. @@ -19,7 +19,7 @@ namespace Prism.Regions /// Gets the value for the RegionName attached property. /// /// The object to adapt. This is typically a container (i.e a control). - /// The name of the region that should be created when + /// The name of the region that should be created when /// the RegionManager is also set in this element. string GetRegionName(VisualElement element); diff --git a/src/Forms/Prism.Forms.Regions/Regions/ItemMetadata.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/ItemMetadata.cs similarity index 98% rename from src/Forms/Prism.Forms.Regions/Regions/ItemMetadata.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/ItemMetadata.cs index 713d8895ab1a1b75e74b3d12e82244beecc1bd5b..d775f43a1829d786ec12e86f3262422afe428da0 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/ItemMetadata.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/ItemMetadata.cs @@ -1,7 +1,7 @@ using System; using Xamarin.Forms; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Defines a class that wraps an item and adds metadata for it. diff --git a/src/Forms/Prism.Forms.Regions/Regions/Navigation/RegionNavigationContentLoader.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Navigation/RegionNavigationContentLoader.cs similarity index 99% rename from src/Forms/Prism.Forms.Regions/Regions/Navigation/RegionNavigationContentLoader.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Navigation/RegionNavigationContentLoader.cs index 83d727427f4ab0ece98fd6988f4aa285d877e297..4d1ff1c736031f3aa76b43fa71e237357da33318 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Navigation/RegionNavigationContentLoader.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Navigation/RegionNavigationContentLoader.cs @@ -8,7 +8,7 @@ using Prism.Ioc.Internals; using Prism.Properties; using Xamarin.Forms; -namespace Prism.Regions.Navigation +namespace Prism.Navigation.Regions.Navigation { /// /// Implementation of that relies on a diff --git a/src/Forms/Prism.Forms.Regions/Regions/Navigation/RegionNavigationService.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Navigation/RegionNavigationService.cs similarity index 99% rename from src/Forms/Prism.Forms.Regions/Regions/Navigation/RegionNavigationService.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Navigation/RegionNavigationService.cs index 80f1791f533ce46ccc4e3769659019af9a6e078d..122e2c14bf0066dd773422cf5f16b5efb93c2447 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Navigation/RegionNavigationService.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Navigation/RegionNavigationService.cs @@ -2,12 +2,10 @@ using System.Linq; using Prism.Common; using Prism.Ioc; -using Prism.Navigation; using Prism.Properties; -using Prism.Regions; using Xamarin.Forms; -namespace Prism.Regions.Navigation +namespace Prism.Navigation.Regions.Navigation { /// /// Provides navigation for regions. diff --git a/src/Forms/Prism.Forms.Regions/Regions/Region.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Region.cs similarity index 99% rename from src/Forms/Prism.Forms.Regions/Regions/Region.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Region.cs index ccf7cdeb81d8fdc5984aa659f77cb4b442801132..9ac413648fb2547ed90500fad89660b7479d2fb1 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Region.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Region.cs @@ -4,11 +4,10 @@ using System.Globalization; using System.Linq; using Prism.Ioc; using Prism.Mvvm; -using Prism.Navigation; using Prism.Properties; using Xamarin.Forms; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Implementation of that allows multiple active views. diff --git a/src/Forms/Prism.Forms.Regions/Regions/RegionCollection.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/RegionCollection.cs similarity index 98% rename from src/Forms/Prism.Forms.Regions/Regions/RegionCollection.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/RegionCollection.cs index c9e2516ab77eacd5c0f8d051f531eb54e89d0b53..378f6d2d951759f0a17496fc27f8df34a27315cf 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/RegionCollection.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/RegionCollection.cs @@ -6,7 +6,7 @@ using System.Globalization; using System.Linq; using Prism.Properties; -namespace Prism.Regions +namespace Prism.Navigation.Regions { internal class RegionCollection : IRegionCollection { @@ -66,7 +66,7 @@ namespace Prism.Regions } _regions.Add(region); - region.RegionManager = this.regionManager; + region.RegionManager = regionManager; OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, region, 0)); } diff --git a/src/Forms/Prism.Forms.Regions/Regions/RegionContext.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/RegionContext.cs similarity index 96% rename from src/Forms/Prism.Forms.Regions/Regions/RegionContext.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/RegionContext.cs index b0456ed29c124ad2a688e9c01ffaa2b60956722f..cbc5ad20a10f07a555c393f404d30fc4f1852a2a 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/RegionContext.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/RegionContext.cs @@ -1,9 +1,9 @@ using System; using Prism.Common; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions.Behaviors; using Xamarin.Forms; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Class that holds methods to Set and Get the RegionContext from a BindableObject. diff --git a/src/Forms/Prism.Forms.Regions/Regions/RegionManager.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/RegionManager.cs similarity index 99% rename from src/Forms/Prism.Forms.Regions/Regions/RegionManager.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/RegionManager.cs index 1cd77e845555ceddd542c881e7c3a6145db39492..81822c539aec194a5c67fa291de29e244e1e009e 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/RegionManager.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/RegionManager.cs @@ -4,11 +4,10 @@ using System.Threading; using Prism.Common; using Prism.Ioc; using Prism.Ioc.Internals; -using Prism.Navigation; using Prism.Properties; using Xamarin.Forms; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// This class is responsible for maintaining a collection of regions and attaching regions to controls. diff --git a/src/Forms/Prism.Forms.Regions/Regions/SingleActiveRegion.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/SingleActiveRegion.cs similarity index 96% rename from src/Forms/Prism.Forms.Regions/Regions/SingleActiveRegion.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/SingleActiveRegion.cs index fa851d0ae20d4eb3559ba3e39c00293bd6a7bc5e..7eaea784104170bd5574850ac6d8c8d148145e5a 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/SingleActiveRegion.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/SingleActiveRegion.cs @@ -1,6 +1,6 @@ using System.Linq; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Region that allows a maximum of one active view at a time. diff --git a/src/Forms/Prism.Forms.Regions/Regions/ViewsCollection.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/ViewsCollection.cs similarity index 92% rename from src/Forms/Prism.Forms.Regions/Regions/ViewsCollection.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/ViewsCollection.cs index 53ae7315e3d523a5cbe729fc7617adf9fd278c0a..51b29b2c26fdbc24a5a38733ed726cedf137add4 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/ViewsCollection.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/ViewsCollection.cs @@ -7,7 +7,7 @@ using System.Linq; using Prism.Mvvm; using Xamarin.Forms; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Implementation of that takes an of @@ -83,7 +83,7 @@ namespace Prism.Regions /// IEnumerator IEnumerable.GetEnumerator() { - return this.GetEnumerator(); + return GetEnumerator(); } /// @@ -125,12 +125,12 @@ namespace Prism.Regions /// private void RemoveAllMetadataMonitors() { - foreach (var item in this._monitoredItems) + foreach (var item in _monitoredItems) { - item.Key.MetadataChanged -= this.OnItemMetadataChanged; + item.Key.MetadataChanged -= OnItemMetadataChanged; } - this._monitoredItems.Clear(); + _monitoredItems.Clear(); } /// @@ -174,7 +174,7 @@ namespace Prism.Regions bool foundInfo = _monitoredItems.TryGetValue(itemMetadata, out MonitorInfo monitorInfo); if (!foundInfo) return; - if (this.Filter(itemMetadata)) + if (Filter(itemMetadata)) { if (!monitorInfo.IsInList) { @@ -182,7 +182,7 @@ namespace Prism.Regions // as in our list so we can consider this // an Add. monitorInfo.IsInList = true; - this.UpdateFilteredItemsList(); + UpdateFilteredItemsList(); NotifyAdd(itemMetadata.Item); } } @@ -192,7 +192,7 @@ namespace Prism.Regions // tracking list, but should not remove any monitoring in // case it fits our filter in the future. monitorInfo.IsInList = false; - this.RemoveFromFilteredList(itemMetadata.Item); + RemoveFromFilteredList(itemMetadata.Item); } } @@ -218,11 +218,11 @@ namespace Prism.Regions } // If we're sorting we can't predict how - // the collection has changed on an add so we + // the collection has changed on an add so we // resort to a reset notification. if (SortComparison != null) { - this.NotifyReset(); + NotifyReset(); } break; @@ -230,19 +230,19 @@ namespace Prism.Regions case NotifyCollectionChangedAction.Remove: foreach (ItemMetadata itemMetadata in e.OldItems) { - this.RemoveMetadataMonitor(itemMetadata); - if (this.Filter(itemMetadata)) + RemoveMetadataMonitor(itemMetadata); + if (Filter(itemMetadata)) { - this.RemoveFromFilteredList(itemMetadata.Item); + RemoveFromFilteredList(itemMetadata.Item); } } break; default: - this.ResetAllMonitors(); - this.UpdateFilteredItemsList(); - this.NotifyReset(); + ResetAllMonitors(); + UpdateFilteredItemsList(); + NotifyReset(); break; } @@ -283,12 +283,12 @@ namespace Prism.Regions public override int Compare(VisualElement x, VisualElement y) { - if (this.comparer == null) + if (comparer == null) { return 0; } - return this.comparer(x, y); + return comparer(x, y); } } diff --git a/src/Forms/Prism.Forms.Regions/Regions/Xaml/RegionManager.cs b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Xaml/RegionManager.cs similarity index 98% rename from src/Forms/Prism.Forms.Regions/Regions/Xaml/RegionManager.cs rename to src/Forms/Prism.Forms.Regions/Navigation/Regions/Xaml/RegionManager.cs index c96c67320cd05d935866d105880e04f855989dd8..5e289db8aa7f2b40a6f2763aa3c11eba788cc259 100644 --- a/src/Forms/Prism.Forms.Regions/Regions/Xaml/RegionManager.cs +++ b/src/Forms/Prism.Forms.Regions/Navigation/Regions/Xaml/RegionManager.cs @@ -4,12 +4,12 @@ using System.Reflection; using Prism.Common; using Prism.Events; using Prism.Ioc; +using Prism.Navigation.Regions.Adapters; +using Prism.Navigation.Regions.Behaviors; using Prism.Properties; -using Prism.Regions.Adapters; -using Prism.Regions.Behaviors; using Xamarin.Forms; -namespace Prism.Regions.Xaml +namespace Prism.Navigation.Regions.Xaml { /// /// A class to provide Bindable Properties and helpers for Regions. diff --git a/src/Forms/Prism.Forms.Regions/Prism.Forms.Regions.csproj b/src/Forms/Prism.Forms.Regions/Prism.Forms.Regions.csproj index 6fc5b9c8d31c5b1bbfbf6584fea9e3cdba3fa43c..180804026f641864df40e106b3f4c3d0f9cd76c5 100644 --- a/src/Forms/Prism.Forms.Regions/Prism.Forms.Regions.csproj +++ b/src/Forms/Prism.Forms.Regions/Prism.Forms.Regions.csproj @@ -13,13 +13,13 @@ Prism.Forms.Regions helps you more easily design and build rich, flexible, and e - - - - - - - + + + + + + + True True diff --git a/src/Forms/Prism.Forms.Regions/Properties/AssemblyInfo.cs b/src/Forms/Prism.Forms.Regions/Properties/AssemblyInfo.cs index 1e8f340bba212c4940b1d41af91e6845a329895c..eb1b0599f06a187ec9a1b63c917e507bde2ea35c 100644 --- a/src/Forms/Prism.Forms.Regions/Properties/AssemblyInfo.cs +++ b/src/Forms/Prism.Forms.Regions/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ using System.Runtime.CompilerServices; using Xamarin.Forms; -[assembly: XmlnsDefinition("http://prismlibrary.com", "Prism.Regions.Xaml")] +[assembly: XmlnsDefinition("http://prismlibrary.com", "Prism.Navigation.Regions.Xaml")] [assembly: InternalsVisibleTo("Prism.Forms.Regions.Tests")] diff --git a/src/Maui/Prism.Maui/Common/MvvmHelpers.cs b/src/Maui/Prism.Maui/Common/MvvmHelpers.cs index 52c26bdf0aeb5870fb1105edff84230afb49d0ee..2d91c56c4fe68c14fe3129bbfb197782f9705d95 100644 --- a/src/Maui/Prism.Maui/Common/MvvmHelpers.cs +++ b/src/Maui/Prism.Maui/Common/MvvmHelpers.cs @@ -2,8 +2,7 @@ using System.Reflection; using Prism.Navigation; using Prism.Navigation.Xaml; -using Prism.Regions; -using Prism.Regions.Navigation; +using Prism.Navigation.Regions; using NavigationMode = Prism.Navigation.NavigationMode; using TabbedPage = Microsoft.Maui.Controls.TabbedPage; diff --git a/src/Maui/Prism.Maui/Ioc/RegionNavigationRegistrationExtensions.cs b/src/Maui/Prism.Maui/Ioc/RegionNavigationRegistrationExtensions.cs index 5ea94814b03534b8017929a8624d2f182f10552a..00d85a46920ab70c946233c871316db10aebe6ba 100644 --- a/src/Maui/Prism.Maui/Ioc/RegionNavigationRegistrationExtensions.cs +++ b/src/Maui/Prism.Maui/Ioc/RegionNavigationRegistrationExtensions.cs @@ -1,9 +1,10 @@ using Microsoft.Maui.Controls.Compatibility; using Prism.Mvvm; -using Prism.Regions; -using Prism.Regions.Adapters; -using Prism.Regions.Behaviors; -using Prism.Regions.Navigation; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Adapters; +using Prism.Navigation.Regions.Behaviors; +using Prism.Navigation.Regions.Navigation; +using Prism.Navigation.Regions; namespace Prism.Ioc; @@ -19,7 +20,7 @@ public static class RegionNavigationRegistrationExtensions /// used to register type for Navigation. /// The unique name to register with the View public static IContainerRegistry RegisterForRegionNavigation(this IContainerRegistry containerRegistry, string name = null) - where TView : View => + where TView : View => containerRegistry.RegisterForNavigationWithViewModel(typeof(TView), null, name); /// @@ -31,7 +32,7 @@ public static class RegionNavigationRegistrationExtensions /// public static IContainerRegistry RegisterForRegionNavigation(this IContainerRegistry containerRegistry, string name = null) where TView : View - where TViewModel : class => + where TViewModel : class => containerRegistry.RegisterForNavigationWithViewModel(typeof(TView), typeof(TViewModel), name); private static IContainerRegistry RegisterForNavigationWithViewModel(this IContainerRegistry containerRegistry, Type viewType, Type viewModelType, string name) @@ -41,7 +42,7 @@ public static class RegionNavigationRegistrationExtensions if (viewModelType is not null) containerRegistry.Register(viewModelType); - + containerRegistry.Register(viewType) .RegisterInstance(new ViewRegistration { diff --git a/src/Maui/Prism.Maui/Navigation/Internals/ChildRegionCollection.cs b/src/Maui/Prism.Maui/Navigation/Internals/ChildRegionCollection.cs index e9105c42ac508fab8c5b3b6077c53204bfff4dc1..952fb528b696fea93b332030ed850048e4ab7c1e 100644 --- a/src/Maui/Prism.Maui/Navigation/Internals/ChildRegionCollection.cs +++ b/src/Maui/Prism.Maui/Navigation/Internals/ChildRegionCollection.cs @@ -1,5 +1,5 @@ using System.Collections; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism.Navigation.Internals; diff --git a/src/Maui/Prism.Maui/Regions/Adapters/CarouselViewRegionAdapter.cs b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/CarouselViewRegionAdapter.cs similarity index 97% rename from src/Maui/Prism.Maui/Regions/Adapters/CarouselViewRegionAdapter.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Adapters/CarouselViewRegionAdapter.cs index de3f208228542da1d5e04e1efbf153c9443884ce..f224413efe9f027045f99d19ac827e05cef17884 100644 --- a/src/Maui/Prism.Maui/Regions/Adapters/CarouselViewRegionAdapter.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/CarouselViewRegionAdapter.cs @@ -4,10 +4,8 @@ using Prism.Common; using Prism.Ioc; using Prism.Mvvm; using Prism.Properties; -using Prism.Regions.Behaviors; -using Prism.Regions.Navigation; -namespace Prism.Regions.Adapters; +namespace Prism.Navigation.Regions.Adapters; /// /// Adapter that creates a new and monitors its @@ -114,7 +112,7 @@ public class CarouselViewRegionAdapter : RegionAdapterBase } var name = newActiveView.GetValue(ViewModelLocator.NavigationNameProperty) as string; - if(string.IsNullOrEmpty(name)) + if (string.IsNullOrEmpty(name)) { var viewType = newActiveView.GetType(); var registry = _region.Container().Resolve(); diff --git a/src/Maui/Prism.Maui/Regions/Adapters/CollectionViewRegionAdapter.cs b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/CollectionViewRegionAdapter.cs similarity index 96% rename from src/Maui/Prism.Maui/Regions/Adapters/CollectionViewRegionAdapter.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Adapters/CollectionViewRegionAdapter.cs index 17659fec8340493c3dd39005a5be5854d2cd30e3..334342ab7223cbfd7ab632dd4c78032198bfdb1d 100644 --- a/src/Maui/Prism.Maui/Regions/Adapters/CollectionViewRegionAdapter.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/CollectionViewRegionAdapter.cs @@ -1,8 +1,7 @@ using Prism.Ioc; using Prism.Properties; -using Prism.Regions.Behaviors; -namespace Prism.Regions.Adapters; +namespace Prism.Navigation.Regions.Adapters; /// /// Adapter that creates a new and monitors its diff --git a/src/Maui/Prism.Maui/Regions/Adapters/ContentViewRegionAdapter.cs b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/ContentViewRegionAdapter.cs similarity index 88% rename from src/Maui/Prism.Maui/Regions/Adapters/ContentViewRegionAdapter.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Adapters/ContentViewRegionAdapter.cs index 5b110f004930c32d6ff9d1878903f4d5a9342eef..2aa73775ea16718d033405553bb5c6064e431a1e 100644 --- a/src/Maui/Prism.Maui/Regions/Adapters/ContentViewRegionAdapter.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/ContentViewRegionAdapter.cs @@ -1,7 +1,4 @@ -using Prism.Ioc; -using Prism.Regions.Behaviors; - -namespace Prism.Regions.Adapters; +namespace Prism.Navigation.Regions.Adapters; /// /// Adapter that creates a new and monitors its diff --git a/src/Maui/Prism.Maui/Regions/Adapters/ContentViewRegionAdapter{TContentView}.cs b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/ContentViewRegionAdapter{TContentView}.cs similarity index 97% rename from src/Maui/Prism.Maui/Regions/Adapters/ContentViewRegionAdapter{TContentView}.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Adapters/ContentViewRegionAdapter{TContentView}.cs index 45b6aa7a6c76fd00f4e1ca9acdd3ada9f1c9b6eb..3ba29e628fbca23f247386b328988b2d9490944b 100644 --- a/src/Maui/Prism.Maui/Regions/Adapters/ContentViewRegionAdapter{TContentView}.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/ContentViewRegionAdapter{TContentView}.cs @@ -1,9 +1,8 @@ using System.Collections.Specialized; using Prism.Ioc; using Prism.Properties; -using Prism.Regions.Behaviors; -namespace Prism.Regions.Adapters; +namespace Prism.Navigation.Regions.Adapters; /// /// Adapter that creates a new and monitors its diff --git a/src/Maui/Prism.Maui/Regions/Adapters/IRegionAdapter.cs b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/IRegionAdapter.cs similarity index 92% rename from src/Maui/Prism.Maui/Regions/Adapters/IRegionAdapter.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Adapters/IRegionAdapter.cs index 8759ea4c7e25196034e5ad6159c0d1f920d6b010..e32c3dc7d653ca94996bb851000a0afe40abf636 100644 --- a/src/Maui/Prism.Maui/Regions/Adapters/IRegionAdapter.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/IRegionAdapter.cs @@ -1,4 +1,4 @@ -namespace Prism.Regions.Adapters; +namespace Prism.Navigation.Regions.Adapters; /// /// Defines an interfaces to adapt an object and bind it to a new . diff --git a/src/Maui/Prism.Maui/Regions/Adapters/LayoutViewRegionAdapter.cs b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/LayoutViewRegionAdapter.cs similarity index 96% rename from src/Maui/Prism.Maui/Regions/Adapters/LayoutViewRegionAdapter.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Adapters/LayoutViewRegionAdapter.cs index d5cb11f18fdd6c463f53faca63650585fb67f77a..07f48a0f939085ec0fe45b2334eaabd22b52c388 100644 --- a/src/Maui/Prism.Maui/Regions/Adapters/LayoutViewRegionAdapter.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/LayoutViewRegionAdapter.cs @@ -1,9 +1,8 @@ using Microsoft.Maui.Controls.Compatibility; using Prism.Ioc; using Prism.Properties; -using Prism.Regions.Behaviors; -namespace Prism.Regions.Adapters; +namespace Prism.Navigation.Regions.Adapters; /// /// Adapter that creates a new and monitors its diff --git a/src/Maui/Prism.Maui/Regions/Adapters/RegionAdapterBase.cs b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/RegionAdapterBase.cs similarity index 98% rename from src/Maui/Prism.Maui/Regions/Adapters/RegionAdapterBase.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Adapters/RegionAdapterBase.cs index 9bd9bf9957fa3c60c49a434d4f454f9d44897ce0..c803e66cc4d2b1c02af429374a3a07848945c221 100644 --- a/src/Maui/Prism.Maui/Regions/Adapters/RegionAdapterBase.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/RegionAdapterBase.cs @@ -1,12 +1,11 @@ using System.Globalization; using Prism.Extensions; using Prism.Ioc; +using Prism.Navigation.Regions.Behaviors; using Prism.Navigation.Xaml; using Prism.Properties; -using Prism.Regions.Behaviors; -using XamlNavigation = Prism.Navigation.Xaml.Navigation; -namespace Prism.Regions.Adapters; +namespace Prism.Navigation.Regions.Adapters; /// /// Base class to facilitate the creation of implementations. diff --git a/src/Maui/Prism.Maui/Regions/Adapters/RegionAdapterMappings.cs b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/RegionAdapterMappings.cs similarity index 99% rename from src/Maui/Prism.Maui/Regions/Adapters/RegionAdapterMappings.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Adapters/RegionAdapterMappings.cs index 404a069d07888bd465750b764a0f89fbaf99923f..41e1953e739dc8cdc349651fec15b091b5d95ba1 100644 --- a/src/Maui/Prism.Maui/Regions/Adapters/RegionAdapterMappings.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/RegionAdapterMappings.cs @@ -2,7 +2,7 @@ using Prism.Ioc; using Prism.Properties; -namespace Prism.Regions.Adapters; +namespace Prism.Navigation.Regions.Adapters; /// /// This class maps with . diff --git a/src/Maui/Prism.Maui/Regions/Adapters/RegionItemsSourceTemplate.cs b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/RegionItemsSourceTemplate.cs similarity index 92% rename from src/Maui/Prism.Maui/Regions/Adapters/RegionItemsSourceTemplate.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Adapters/RegionItemsSourceTemplate.cs index fb1875a6c33e1e843ca37d3ea1ddda434ec9dab8..50d66516586a5c27aa1074f3d1ab5fcdb4eaaaf4 100644 --- a/src/Maui/Prism.Maui/Regions/Adapters/RegionItemsSourceTemplate.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/RegionItemsSourceTemplate.cs @@ -1,4 +1,4 @@ -namespace Prism.Regions.Adapters; +namespace Prism.Navigation.Regions.Adapters; // Implementation Note: // In discussing with PureWeen, it is best to provide a ContentView and provide a diff --git a/src/Maui/Prism.Maui/Regions/Adapters/ScrollViewRegionAdapter.cs b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/ScrollViewRegionAdapter.cs similarity index 96% rename from src/Maui/Prism.Maui/Regions/Adapters/ScrollViewRegionAdapter.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Adapters/ScrollViewRegionAdapter.cs index f37c258f1de68eb281cd02f0714447bdc944a26f..53a58f95e393f1d0c615a1714f4e8baadeb8ab35 100644 --- a/src/Maui/Prism.Maui/Regions/Adapters/ScrollViewRegionAdapter.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Adapters/ScrollViewRegionAdapter.cs @@ -1,9 +1,8 @@ using System.Collections.Specialized; using Prism.Ioc; using Prism.Properties; -using Prism.Regions.Behaviors; -namespace Prism.Regions.Adapters; +namespace Prism.Navigation.Regions.Adapters; /// /// Adapter that creates a new and monitors its @@ -57,4 +56,4 @@ public class ScrollViewRegionAdapter : RegionAdapterBase /// A new instance of . protected override IRegion CreateRegion(IContainerProvider container) => container.Resolve(); -} \ No newline at end of file +} diff --git a/src/Maui/Prism.Maui/Regions/AllActiveRegion.cs b/src/Maui/Prism.Maui/Navigation/Regions/AllActiveRegion.cs similarity index 96% rename from src/Maui/Prism.Maui/Regions/AllActiveRegion.cs rename to src/Maui/Prism.Maui/Navigation/Regions/AllActiveRegion.cs index f7dc459d206226e79cf4816b43a4a143ce62c9c6..aa3d4bdce3eb2d8fcaeac4d88580bdb4c2da5e6d 100644 --- a/src/Maui/Prism.Maui/Regions/AllActiveRegion.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/AllActiveRegion.cs @@ -1,6 +1,6 @@ using Prism.Properties; -namespace Prism.Regions; +namespace Prism.Navigation.Regions; /// /// Region that keeps all the views in it as active. Deactivation of views is not allowed. @@ -11,7 +11,7 @@ public class AllActiveRegion : Region /// Creates a new . /// /// - public AllActiveRegion(IRegionNavigationService regionNavigationService) + public AllActiveRegion(IRegionNavigationService regionNavigationService) : base(regionNavigationService) { } diff --git a/src/Maui/Prism.Maui/Regions/Behaviors/AutoPopulateRegionBehavior.cs b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/AutoPopulateRegionBehavior.cs similarity index 96% rename from src/Maui/Prism.Maui/Regions/Behaviors/AutoPopulateRegionBehavior.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Behaviors/AutoPopulateRegionBehavior.cs index 7f21f945f2d57b8f1cd7d801a66ec8319eb0530a..5f2b4397a8a84e14ce4cd2208762538900f9e7e1 100644 --- a/src/Maui/Prism.Maui/Regions/Behaviors/AutoPopulateRegionBehavior.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/AutoPopulateRegionBehavior.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using Prism.Ioc; -namespace Prism.Regions.Behaviors; +namespace Prism.Navigation.Regions.Behaviors; /// /// Populates the target region with the views registered to it in the . @@ -54,12 +54,12 @@ public class AutoPopulateRegionBehavior : RegionBehavior Region.Add(targetName); else if (defaultView is VisualElement element) Region.Add(element); - else if(defaultView is Type type) + else if (defaultView is Type type) { var container = targetAware.Container; var registry = container.Resolve(); var registration = registry.Registrations.FirstOrDefault(x => x.View == type); - if(registration is not null) + if (registration is not null) { var view = registry.CreateView(container, registration.Name) as VisualElement; Region.Add(view); diff --git a/src/Maui/Prism.Maui/Regions/Behaviors/BindRegionContextToVisualElementBehavior.cs b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/BindRegionContextToVisualElementBehavior.cs similarity index 97% rename from src/Maui/Prism.Maui/Regions/Behaviors/BindRegionContextToVisualElementBehavior.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Behaviors/BindRegionContextToVisualElementBehavior.cs index 808bdd6589141bbad91b584cd0e5d0d559290c43..ba8aa841d71a19319d9b6f2e465bd0de8bba9ce0 100644 --- a/src/Maui/Prism.Maui/Regions/Behaviors/BindRegionContextToVisualElementBehavior.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/BindRegionContextToVisualElementBehavior.cs @@ -3,10 +3,10 @@ using System.Collections.Specialized; using System.ComponentModel; using Prism.Common; -namespace Prism.Regions.Behaviors; +namespace Prism.Navigation.Regions.Behaviors; /// -/// Defines a behavior that forwards the +/// Defines a behavior that forwards the /// to the views in the region. /// public class BindRegionContextToVisualElementBehavior : IRegionBehavior diff --git a/src/Maui/Prism.Maui/Regions/Behaviors/ClearChildViewsRegionBehavior.cs b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/ClearChildViewsRegionBehavior.cs similarity index 88% rename from src/Maui/Prism.Maui/Regions/Behaviors/ClearChildViewsRegionBehavior.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Behaviors/ClearChildViewsRegionBehavior.cs index c47c77846a257d894f4642c4beb3cf08521ba397..1e1c934c384a199a110d782fda34a9af2fdf7834 100644 --- a/src/Maui/Prism.Maui/Regions/Behaviors/ClearChildViewsRegionBehavior.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/ClearChildViewsRegionBehavior.cs @@ -1,4 +1,4 @@ -namespace Prism.Regions.Behaviors; +namespace Prism.Navigation.Regions.Behaviors; /// /// Behavior that removes the RegionManager attached property of all the views in a region once the RegionManager property of a region becomes null. @@ -31,7 +31,7 @@ public class ClearChildViewsRegionBehavior : RegionBehavior if (target == null) throw new ArgumentNullException(nameof(target)); - return (bool)target.GetValue(ClearChildViewsRegionBehavior.ClearChildViewsProperty); + return (bool)target.GetValue(ClearChildViewsProperty); } /// @@ -44,7 +44,7 @@ public class ClearChildViewsRegionBehavior : RegionBehavior if (target == null) throw new ArgumentNullException(nameof(target)); - target.SetValue(ClearChildViewsRegionBehavior.ClearChildViewsProperty, value); + target.SetValue(ClearChildViewsProperty, value); } /// @@ -52,7 +52,7 @@ public class ClearChildViewsRegionBehavior : RegionBehavior /// protected override void OnAttach() { - this.Region.PropertyChanged += Region_PropertyChanged; + Region.PropertyChanged += Region_PropertyChanged; } private static void ClearChildViews(IRegion region) @@ -70,9 +70,9 @@ public class ClearChildViewsRegionBehavior : RegionBehavior { if (e.PropertyName == "RegionManager") { - if (this.Region.RegionManager == null) + if (Region.RegionManager == null) { - ClearChildViews(this.Region); + ClearChildViews(Region); } } } diff --git a/src/Maui/Prism.Maui/Regions/Behaviors/DelayedRegionCreationBehavior.cs b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/DelayedRegionCreationBehavior.cs similarity index 96% rename from src/Maui/Prism.Maui/Regions/Behaviors/DelayedRegionCreationBehavior.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Behaviors/DelayedRegionCreationBehavior.cs index 1d99e0f6d0169f864d79d0a5cd38cd59dad66396..a70aba6ee633ba0407295586193664ee61d00404 100644 --- a/src/Maui/Prism.Maui/Regions/Behaviors/DelayedRegionCreationBehavior.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/DelayedRegionCreationBehavior.cs @@ -2,13 +2,11 @@ using System.Globalization; using Prism.Behaviors; using Prism.Extensions; -using Prism.Ioc; +using Prism.Navigation.Regions.Adapters; using Prism.Navigation.Xaml; using Prism.Properties; -using Prism.Regions.Adapters; -using XamlNavigation = Prism.Navigation.Xaml.Navigation; -namespace Prism.Regions.Behaviors; +namespace Prism.Navigation.Regions.Behaviors; /// /// Behavior that creates a new , when the control that will host the (see ) @@ -85,7 +83,7 @@ public class DelayedRegionCreationBehavior /// Called when the is updating it's collection. /// /// The . - /// The instance containing the event data. + /// The instance containing the event data. public void OnUpdatingRegions(object sender, EventArgs e) { TryCreateRegion(); diff --git a/src/Maui/Prism.Maui/Regions/Behaviors/DestructibleRegionBehavior.cs b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/DestructibleRegionBehavior.cs similarity index 94% rename from src/Maui/Prism.Maui/Regions/Behaviors/DestructibleRegionBehavior.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Behaviors/DestructibleRegionBehavior.cs index d785e72a93837f3efcd429704fc79538b84f3b31..68e3732cf3142437e3422e4a58d0da8f34f248d1 100644 --- a/src/Maui/Prism.Maui/Regions/Behaviors/DestructibleRegionBehavior.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/DestructibleRegionBehavior.cs @@ -1,8 +1,7 @@ using System.Collections.Specialized; using Prism.Common; -using Prism.Navigation; -namespace Prism.Regions.Behaviors; +namespace Prism.Navigation.Regions.Behaviors; /// /// Provides a Behavior to Destroy the View/ViewModel when the View is removed from the Region's Views diff --git a/src/Maui/Prism.Maui/Regions/Behaviors/IHostAwareRegionBehavior.cs b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/IHostAwareRegionBehavior.cs similarity index 92% rename from src/Maui/Prism.Maui/Regions/Behaviors/IHostAwareRegionBehavior.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Behaviors/IHostAwareRegionBehavior.cs index 4cd576c7ae89d27907a63ac21a325f4b12350234..d55a38cd8c986f50de835a541f9f54db9800b6b7 100644 --- a/src/Maui/Prism.Maui/Regions/Behaviors/IHostAwareRegionBehavior.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/IHostAwareRegionBehavior.cs @@ -1,4 +1,4 @@ -namespace Prism.Regions.Behaviors; +namespace Prism.Navigation.Regions.Behaviors; /// /// Defines a that not allows extensible behaviors on regions which also interact diff --git a/src/Maui/Prism.Maui/Regions/Behaviors/RegionActiveAwareBehavior.cs b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/RegionActiveAwareBehavior.cs similarity index 86% rename from src/Maui/Prism.Maui/Regions/Behaviors/RegionActiveAwareBehavior.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Behaviors/RegionActiveAwareBehavior.cs index 7d39ca2bf20075614807e483ccf8c7604cc3d13f..a61667e9b45c6af33e88dbffd6772bc2c3e23cbd 100644 --- a/src/Maui/Prism.Maui/Regions/Behaviors/RegionActiveAwareBehavior.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/RegionActiveAwareBehavior.cs @@ -1,17 +1,17 @@ using System.Collections.Specialized; using Prism.Common; -namespace Prism.Regions.Behaviors; +namespace Prism.Navigation.Regions.Behaviors; /// -/// Behavior that monitors a object and +/// Behavior that monitors a object and /// changes the value for the property when -/// an object that implements gets added or removed +/// an object that implements gets added or removed /// from the collection. /// /// /// This class can also sync the active state for any scoped regions directly on the view based on the . -/// If you use the method with the createRegionManagerScope option, the scoped manager will be attached to the view. +/// If you use the method with the createRegionManagerScope option, the scoped manager will be attached to the view. /// public class RegionActiveAwareBehavior : IRegionBehavior { @@ -30,7 +30,7 @@ public class RegionActiveAwareBehavior : IRegionBehavior /// public void Attach() { - INotifyCollectionChanged collection = this.GetCollection(); + INotifyCollectionChanged collection = GetCollection(); if (collection != null) { collection.CollectionChanged += OnCollectionChanged; @@ -42,7 +42,7 @@ public class RegionActiveAwareBehavior : IRegionBehavior /// public void Detach() { - INotifyCollectionChanged collection = this.GetCollection(); + INotifyCollectionChanged collection = GetCollection(); if (collection != null) { collection.CollectionChanged -= OnCollectionChanged; @@ -79,13 +79,13 @@ public class RegionActiveAwareBehavior : IRegionBehavior { if (item is VisualElement visualElement) { - // We are assuming that any scoped region managers are attached directly to the + // We are assuming that any scoped region managers are attached directly to the // view. var regionManager = Xaml.RegionManager.GetRegionManager(visualElement); // If the view's RegionManager attached property is different from the region's RegionManager, // then the view's region manager is a scoped region manager. - if (regionManager == null || regionManager == this.Region.RegionManager) return; + if (regionManager == null || regionManager == Region.RegionManager) return; var activeViews = regionManager.Regions.SelectMany(e => e.ActiveViews); @@ -112,6 +112,6 @@ public class RegionActiveAwareBehavior : IRegionBehavior private INotifyCollectionChanged GetCollection() { - return this.Region.ActiveViews; + return Region.ActiveViews; } } diff --git a/src/Maui/Prism.Maui/Regions/Behaviors/RegionCreationException.cs b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/RegionCreationException.cs similarity index 94% rename from src/Maui/Prism.Maui/Regions/Behaviors/RegionCreationException.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Behaviors/RegionCreationException.cs index ee5ba2453dbb452b7a48f4e73e7d55f15d0e6484..54c0c3e0ee923f1b7c927dfd8ab35cedde59cac6 100644 --- a/src/Maui/Prism.Maui/Regions/Behaviors/RegionCreationException.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/RegionCreationException.cs @@ -1,9 +1,9 @@ using System.Runtime.Serialization; -namespace Prism.Regions.Behaviors; +namespace Prism.Navigation.Regions.Behaviors; /// -/// Represents errors that occured during region creation. +/// Represents errors that occurred during region creation. /// [Serializable] public partial class RegionCreationException : Exception @@ -45,4 +45,4 @@ public partial class RegionCreationException : Exception : base(info, context) { } -} \ No newline at end of file +} diff --git a/src/Maui/Prism.Maui/Regions/Behaviors/RegionManagerRegistrationBehavior.cs b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/RegionManagerRegistrationBehavior.cs similarity index 95% rename from src/Maui/Prism.Maui/Regions/Behaviors/RegionManagerRegistrationBehavior.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Behaviors/RegionManagerRegistrationBehavior.cs index 94631f29480725592164c82b91cacd1b79d80060..b7e71ae275ba10de9a9bba7a789053a6bdb3bdfd 100644 --- a/src/Maui/Prism.Maui/Regions/Behaviors/RegionManagerRegistrationBehavior.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/RegionManagerRegistrationBehavior.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using Prism.Properties; -namespace Prism.Regions.Behaviors; +namespace Prism.Navigation.Regions.Behaviors; /// /// Subscribes to a static event from the in order to register the target @@ -107,7 +107,7 @@ public class RegionManagerRegistrationBehavior : RegionBehavior, IHostAwareRegio } /// - /// This event handler gets called when a RegionManager is requering the instances of a region to be registered if they are not already. + /// This event handler gets called when a RegionManager is requiring the instances of a region to be registered if they are not already. /// Although this is a public method to support Weak Delegates in Silverlight, it should not be called by the user. /// /// The sender. @@ -121,10 +121,10 @@ public class RegionManagerRegistrationBehavior : RegionBehavior, IHostAwareRegio { if (element is VisualElement visualElement) { - var regionmanager = RegionManagerAccessor.GetRegionManager(visualElement); - if (regionmanager != null) + var regionManager = RegionManagerAccessor.GetRegionManager(visualElement); + if (regionManager != null) { - return regionmanager; + return regionManager; } } diff --git a/src/Maui/Prism.Maui/Regions/Behaviors/RegionMemberLifetimeBehavior.cs b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/RegionMemberLifetimeBehavior.cs similarity index 97% rename from src/Maui/Prism.Maui/Regions/Behaviors/RegionMemberLifetimeBehavior.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Behaviors/RegionMemberLifetimeBehavior.cs index b5e9a33231011063706a32738e9b3cccd812117e..61f8d53a79abdc366ad4e44f7d7b9a2072c2f5bc 100644 --- a/src/Maui/Prism.Maui/Regions/Behaviors/RegionMemberLifetimeBehavior.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/RegionMemberLifetimeBehavior.cs @@ -1,7 +1,7 @@ using System.Collections.Specialized; using Prism.Common; -namespace Prism.Regions.Behaviors; +namespace Prism.Navigation.Regions.Behaviors; /// /// The RegionMemberLifetimeBehavior determines if items should be removed from the @@ -9,10 +9,10 @@ namespace Prism.Regions.Behaviors; /// /// /// The monitors the -/// collection to discover items that transition into a deactivated state. +/// collection to discover items that transition into a deactivated state. ///

/// The behavior checks the removed items for either the -/// or the (in that order) to determine if it should be kept +/// or the (in that order) to determine if it should be kept /// alive on removal. ///

/// If the item in the collection is a , it will diff --git a/src/Maui/Prism.Maui/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs similarity index 92% rename from src/Maui/Prism.Maui/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs index 430d3615b109f3c595611bcf306ca691e9db6a1d..965657d38bb8af864e771fb9c428fb2fe5636b32 100644 --- a/src/Maui/Prism.Maui/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs @@ -1,14 +1,14 @@ using Prism.Common; using Prism.Properties; -namespace Prism.Regions.Behaviors; +namespace Prism.Navigation.Regions.Behaviors; ///

-/// Behavior that synchronizes the property of a with -/// the control that hosts the Region. It does this by setting the +/// Behavior that synchronizes the property of a with +/// the control that hosts the Region. It does this by setting the /// Dependency Property on the host control. -/// -/// This behavior allows the usage of two way databinding of the RegionContext from XAML. +/// +/// This behavior allows the usage of two way databinding of the RegionContext from XAML. /// public class SyncRegionContextWithHostBehavior : RegionBehavior, IHostAwareRegionBehavior { @@ -16,7 +16,7 @@ public class SyncRegionContextWithHostBehavior : RegionBehavior, IHostAwareRegio private VisualElement _hostControl; /// - /// Name that identifies the SyncRegionContextWithHostBehavior behavior in a collection of RegionsBehaviors. + /// Name that identifies the SyncRegionContextWithHostBehavior behavior in a collection of RegionsBehaviors. /// public static readonly string BehaviorKey = "SyncRegionContextWithHost"; @@ -52,7 +52,7 @@ public class SyncRegionContextWithHostBehavior : RegionBehavior, IHostAwareRegio { if (HostControl != null) { - // Sync values initially. + // Sync values initially. SynchronizeRegionContext(); // Now register for events to keep them in sync diff --git a/src/Maui/Prism.Maui/Regions/DefaultRegionManagerAccessor.cs b/src/Maui/Prism.Maui/Navigation/Regions/DefaultRegionManagerAccessor.cs similarity index 98% rename from src/Maui/Prism.Maui/Regions/DefaultRegionManagerAccessor.cs rename to src/Maui/Prism.Maui/Navigation/Regions/DefaultRegionManagerAccessor.cs index d492ae093ce974926a3a28e201bd7bba7ba1a067..32e810ae594d1402370761129a63a4325e493320 100644 --- a/src/Maui/Prism.Maui/Regions/DefaultRegionManagerAccessor.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/DefaultRegionManagerAccessor.cs @@ -1,6 +1,6 @@ using Prism.Ioc; -namespace Prism.Regions; +namespace Prism.Navigation.Regions; internal class DefaultRegionManagerAccessor : IRegionManagerAccessor { diff --git a/src/Maui/Prism.Maui/Regions/IRegionManagerAccessor.cs b/src/Maui/Prism.Maui/Navigation/Regions/IRegionManagerAccessor.cs similarity index 96% rename from src/Maui/Prism.Maui/Regions/IRegionManagerAccessor.cs rename to src/Maui/Prism.Maui/Navigation/Regions/IRegionManagerAccessor.cs index 3ae2eb4d63bc07353c1a853b95e05caa1d167fab..fd5316c0fe8605b4772d10e02ccb36eebf6bc5a0 100644 --- a/src/Maui/Prism.Maui/Regions/IRegionManagerAccessor.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/IRegionManagerAccessor.cs @@ -1,4 +1,4 @@ -namespace Prism.Regions; +namespace Prism.Navigation.Regions; /// /// Provides an abstraction on top of the RegionManager static members. @@ -16,7 +16,7 @@ public interface IRegionManagerAccessor /// Gets the value for the RegionName attached property. /// /// The object to adapt. This is typically a container (i.e a control). - /// The name of the region that should be created when + /// The name of the region that should be created when /// the RegionManager is also set in this element. string GetRegionName(VisualElement element); diff --git a/src/Maui/Prism.Maui/Regions/IRegionMemberLifetime.cs b/src/Maui/Prism.Maui/Navigation/Regions/IRegionMemberLifetime.cs similarity index 85% rename from src/Maui/Prism.Maui/Regions/IRegionMemberLifetime.cs rename to src/Maui/Prism.Maui/Navigation/Regions/IRegionMemberLifetime.cs index 8cf44e9f1ace08fc0ca8aea20d072bd07f110b09..3333c4a97499716b85484109ffb989366205f525 100644 --- a/src/Maui/Prism.Maui/Regions/IRegionMemberLifetime.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/IRegionMemberLifetime.cs @@ -1,6 +1,6 @@ -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions.Behaviors; -namespace Prism.Regions; +namespace Prism.Navigation.Regions; /// /// When implemented, allows an instance placed in a diff --git a/src/Maui/Prism.Maui/Regions/ITargetAwareRegion.cs b/src/Maui/Prism.Maui/Navigation/Regions/ITargetAwareRegion.cs similarity index 88% rename from src/Maui/Prism.Maui/Regions/ITargetAwareRegion.cs rename to src/Maui/Prism.Maui/Navigation/Regions/ITargetAwareRegion.cs index 4a809b6005305137630a6ce8de6b3d8dcb018e25..563a3124664987cfb110f339a56cd00915fef954 100644 --- a/src/Maui/Prism.Maui/Regions/ITargetAwareRegion.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/ITargetAwareRegion.cs @@ -2,11 +2,12 @@ using Prism.Ioc; using Prism.Navigation.Xaml; -namespace Prism.Regions; +namespace Prism.Navigation.Regions; [EditorBrowsable(EditorBrowsableState.Never)] public interface ITargetAwareRegion : IRegion { VisualElement TargetElement { get; set; } + IContainerProvider Container => TargetElement.GetContainerProvider(); } diff --git a/src/Maui/Prism.Maui/Regions/ItemMetadata.cs b/src/Maui/Prism.Maui/Navigation/Regions/ItemMetadata.cs similarity index 98% rename from src/Maui/Prism.Maui/Regions/ItemMetadata.cs rename to src/Maui/Prism.Maui/Navigation/Regions/ItemMetadata.cs index 5c0b68c509a42962e736707a5f0061b3eb7a2f51..adb151bc210847983c8c481188258af926d494b0 100644 --- a/src/Maui/Prism.Maui/Regions/ItemMetadata.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/ItemMetadata.cs @@ -1,4 +1,4 @@ -namespace Prism.Regions; +namespace Prism.Navigation.Regions; /// /// Defines a class that wraps an item and adds metadata for it. diff --git a/src/Maui/Prism.Maui/Regions/Navigation/RegionNavigationContentLoader.cs b/src/Maui/Prism.Maui/Navigation/Regions/Navigation/RegionNavigationContentLoader.cs similarity index 98% rename from src/Maui/Prism.Maui/Regions/Navigation/RegionNavigationContentLoader.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Navigation/RegionNavigationContentLoader.cs index ab896763055f116185348b514ec8b5a9f624b733..8940098965d616d57d595305428f9e529d4359f7 100644 --- a/src/Maui/Prism.Maui/Regions/Navigation/RegionNavigationContentLoader.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Navigation/RegionNavigationContentLoader.cs @@ -4,7 +4,7 @@ using Prism.Ioc; using Prism.Mvvm; using Prism.Properties; -namespace Prism.Regions.Navigation; +namespace Prism.Navigation.Regions.Navigation; /// /// Implementation of that relies on a @@ -120,7 +120,7 @@ public class RegionNavigationContentLoader : IRegionNavigationContentLoader { var registry = region.Container().Resolve(); var registration = registry.Registrations.FirstOrDefault(x => x.Type == ViewType.Region && (x.Name == candidateNavigationContract || x.View.Name == candidateNavigationContract || x.View.FullName == candidateNavigationContract)); - if(registration is null) + if (registration is null) { GetCandidatesFromRegionViews(region, registration.View.FullName); } diff --git a/src/Maui/Prism.Maui/Regions/Navigation/RegionNavigationService.cs b/src/Maui/Prism.Maui/Navigation/Regions/Navigation/RegionNavigationService.cs similarity index 99% rename from src/Maui/Prism.Maui/Regions/Navigation/RegionNavigationService.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Navigation/RegionNavigationService.cs index 1df06691a36bc9219a6ed5c3dc770a121c1021f3..44d46916505e80181913abbd63c787efd2dbf81c 100644 --- a/src/Maui/Prism.Maui/Regions/Navigation/RegionNavigationService.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Navigation/RegionNavigationService.cs @@ -1,9 +1,8 @@ using Prism.Common; using Prism.Ioc; -using Prism.Navigation; using Prism.Properties; -namespace Prism.Regions.Navigation; +namespace Prism.Navigation.Regions.Navigation; /// /// Provides navigation for regions. diff --git a/src/Maui/Prism.Maui/Regions/Region.cs b/src/Maui/Prism.Maui/Navigation/Regions/Region.cs similarity index 99% rename from src/Maui/Prism.Maui/Regions/Region.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Region.cs index 983cd87afc9baad3db1c7d0a5d598c844d1604a4..699bc946ed192591e81bd5b53d49c18e84450e8f 100644 --- a/src/Maui/Prism.Maui/Regions/Region.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Region.cs @@ -2,11 +2,10 @@ using System.Globalization; using Prism.Ioc; using Prism.Mvvm; -using Prism.Navigation; using Prism.Navigation.Xaml; using Prism.Properties; -namespace Prism.Regions; +namespace Prism.Navigation.Regions; /// /// Implementation of that allows multiple active views. diff --git a/src/Maui/Prism.Maui/Regions/RegionCollection.cs b/src/Maui/Prism.Maui/Navigation/Regions/RegionCollection.cs similarity index 97% rename from src/Maui/Prism.Maui/Regions/RegionCollection.cs rename to src/Maui/Prism.Maui/Navigation/Regions/RegionCollection.cs index e5b645fabb1770e8d1eb8f8c47a392307f2ed941..8d44e9be41662ceedc91b6b828a6daa593644a8a 100644 --- a/src/Maui/Prism.Maui/Regions/RegionCollection.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/RegionCollection.cs @@ -3,7 +3,7 @@ using System.Collections.Specialized; using System.Globalization; using Prism.Properties; -namespace Prism.Regions; +namespace Prism.Navigation.Regions; internal class RegionCollection : IRegionCollection { @@ -63,7 +63,7 @@ internal class RegionCollection : IRegionCollection } _regions.Add(region); - region.RegionManager = this.regionManager; + region.RegionManager = regionManager; OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, region, 0)); } diff --git a/src/Maui/Prism.Maui/Regions/RegionContext.cs b/src/Maui/Prism.Maui/Navigation/Regions/RegionContext.cs similarity index 95% rename from src/Maui/Prism.Maui/Regions/RegionContext.cs rename to src/Maui/Prism.Maui/Navigation/Regions/RegionContext.cs index 9d9460563b9550662338f3f8c182d0fde93c89e7..a476a6737769fd2cbcc6abe92bb4cdce4a1185d6 100644 --- a/src/Maui/Prism.Maui/Regions/RegionContext.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/RegionContext.cs @@ -1,7 +1,7 @@ using Prism.Common; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions.Behaviors; -namespace Prism.Regions; +namespace Prism.Navigation.Regions; /// /// Class that holds methods to Set and Get the RegionContext from a BindableObject. diff --git a/src/Maui/Prism.Maui/Regions/RegionExtensions.cs b/src/Maui/Prism.Maui/Navigation/Regions/RegionExtensions.cs similarity index 90% rename from src/Maui/Prism.Maui/Regions/RegionExtensions.cs rename to src/Maui/Prism.Maui/Navigation/Regions/RegionExtensions.cs index 71605856739b85ff7b62d7e7edb63f620e6813a1..a29b3f413061cfedc8cbf984aa9157ea7bd01d9e 100644 --- a/src/Maui/Prism.Maui/Regions/RegionExtensions.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/RegionExtensions.cs @@ -1,6 +1,6 @@ using Prism.Ioc; -namespace Prism.Regions; +namespace Prism.Navigation.Regions; internal static class RegionExtensions { diff --git a/src/Maui/Prism.Maui/Regions/RegionManager.cs b/src/Maui/Prism.Maui/Navigation/Regions/RegionManager.cs similarity index 99% rename from src/Maui/Prism.Maui/Regions/RegionManager.cs rename to src/Maui/Prism.Maui/Navigation/Regions/RegionManager.cs index 76c366c1fbdfca2ee3b48d4ea128c7c1c2f740b3..2abb34282c4d5cd3d3ec0124de734252afd04ddd 100644 --- a/src/Maui/Prism.Maui/Regions/RegionManager.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/RegionManager.cs @@ -1,8 +1,7 @@ using Prism.Ioc; -using Prism.Navigation; using Prism.Properties; -namespace Prism.Regions; +namespace Prism.Navigation.Regions; /// /// This class is responsible for maintaining a collection of regions and attaching regions to controls. diff --git a/src/Maui/Prism.Maui/Regions/RegionNavigationRegistry.cs b/src/Maui/Prism.Maui/Navigation/Regions/RegionNavigationRegistry.cs similarity index 91% rename from src/Maui/Prism.Maui/Regions/RegionNavigationRegistry.cs rename to src/Maui/Prism.Maui/Navigation/Regions/RegionNavigationRegistry.cs index 8765ef9685781a2b68447163b609d2cec25b28e0..2de2c7d4c66fff74ac2e234666fa3c52e847f3d6 100644 --- a/src/Maui/Prism.Maui/Regions/RegionNavigationRegistry.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/RegionNavigationRegistry.cs @@ -1,7 +1,7 @@ using Prism.Ioc; using Prism.Mvvm; -namespace Prism.Regions; +namespace Prism.Navigation.Regions; internal class RegionNavigationRegistry : ViewRegistryBase, IRegionNavigationRegistry { diff --git a/src/Maui/Prism.Maui/Regions/RegionViewRegistry.cs b/src/Maui/Prism.Maui/Navigation/Regions/RegionViewRegistry.cs similarity index 97% rename from src/Maui/Prism.Maui/Regions/RegionViewRegistry.cs rename to src/Maui/Prism.Maui/Navigation/Regions/RegionViewRegistry.cs index dc2695c2145174f75980eac08fc6c34d0e6af29f..c3a04bf33d35ee8391cce18d95d2368cfb3f598b 100644 --- a/src/Maui/Prism.Maui/Regions/RegionViewRegistry.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/RegionViewRegistry.cs @@ -6,15 +6,15 @@ using Prism.Ioc; using Prism.Mvvm; using Prism.Properties; -namespace Prism.Regions; +namespace Prism.Navigation.Regions; /// /// Defines a registry for the content of the regions used on View Discovery composition. /// public class RegionViewRegistry : IRegionViewRegistry { - private readonly ListDictionary> _registeredContent = new (); - private readonly WeakDelegatesManager _contentRegisteredListeners = new (); + private readonly ListDictionary> _registeredContent = new(); + private readonly WeakDelegatesManager _contentRegisteredListeners = new(); /// /// Occurs whenever a new view is registered. @@ -75,7 +75,7 @@ public class RegionViewRegistry : IRegionViewRegistry } /// - /// Registers a delegate that can be used to retrieve the content associated with a region name. + /// Registers a delegate that can be used to retrieve the content associated with a region name. /// /// Region name to which the will be registered. /// Delegate used to retrieve the content associated with the . diff --git a/src/Maui/Prism.Maui/Regions/SingleActiveRegion.cs b/src/Maui/Prism.Maui/Navigation/Regions/SingleActiveRegion.cs similarity index 94% rename from src/Maui/Prism.Maui/Regions/SingleActiveRegion.cs rename to src/Maui/Prism.Maui/Navigation/Regions/SingleActiveRegion.cs index dc31b56e26d24d5528541bfa6d59f6ad641d3ca3..48c58000cb1c6c6c4d93fa23d12718177af787dc 100644 --- a/src/Maui/Prism.Maui/Regions/SingleActiveRegion.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/SingleActiveRegion.cs @@ -1,6 +1,4 @@ -using Prism.Regions.Navigation; - -namespace Prism.Regions; +namespace Prism.Navigation.Regions; /// /// Region that allows a maximum of one active view at a time. diff --git a/src/Maui/Prism.Maui/Regions/ViewsCollection.cs b/src/Maui/Prism.Maui/Navigation/Regions/ViewsCollection.cs similarity index 91% rename from src/Maui/Prism.Maui/Regions/ViewsCollection.cs rename to src/Maui/Prism.Maui/Navigation/Regions/ViewsCollection.cs index e5019eefd67cb86518c4e5078153e1891959e929..0d14847bcac2cc4467b553793aa2719c16354008 100644 --- a/src/Maui/Prism.Maui/Regions/ViewsCollection.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/ViewsCollection.cs @@ -3,7 +3,7 @@ using System.Collections.ObjectModel; using System.Collections.Specialized; using Prism.Mvvm; -namespace Prism.Regions; +namespace Prism.Navigation.Regions; /// /// Implementation of that takes an of @@ -79,7 +79,7 @@ public class ViewsCollection : BindableBase, IViewsCollection /// IEnumerator IEnumerable.GetEnumerator() { - return this.GetEnumerator(); + return GetEnumerator(); } /// @@ -121,12 +121,12 @@ public class ViewsCollection : BindableBase, IViewsCollection /// private void RemoveAllMetadataMonitors() { - foreach (var item in this._monitoredItems) + foreach (var item in _monitoredItems) { - item.Key.MetadataChanged -= this.OnItemMetadataChanged; + item.Key.MetadataChanged -= OnItemMetadataChanged; } - this._monitoredItems.Clear(); + _monitoredItems.Clear(); } /// @@ -170,7 +170,7 @@ public class ViewsCollection : BindableBase, IViewsCollection bool foundInfo = _monitoredItems.TryGetValue(itemMetadata, out MonitorInfo monitorInfo); if (!foundInfo) return; - if (this.Filter(itemMetadata)) + if (Filter(itemMetadata)) { if (!monitorInfo.IsInList) { @@ -178,7 +178,7 @@ public class ViewsCollection : BindableBase, IViewsCollection // as in our list so we can consider this // an Add. monitorInfo.IsInList = true; - this.UpdateFilteredItemsList(); + UpdateFilteredItemsList(); NotifyAdd(itemMetadata.Item); } } @@ -188,7 +188,7 @@ public class ViewsCollection : BindableBase, IViewsCollection // tracking list, but should not remove any monitoring in // case it fits our filter in the future. monitorInfo.IsInList = false; - this.RemoveFromFilteredList(itemMetadata.Item); + RemoveFromFilteredList(itemMetadata.Item); } } @@ -214,11 +214,11 @@ public class ViewsCollection : BindableBase, IViewsCollection } // If we're sorting we can't predict how - // the collection has changed on an add so we + // the collection has changed on an add so we // resort to a reset notification. if (SortComparison != null) { - this.NotifyReset(); + NotifyReset(); } break; @@ -226,19 +226,19 @@ public class ViewsCollection : BindableBase, IViewsCollection case NotifyCollectionChangedAction.Remove: foreach (ItemMetadata itemMetadata in e.OldItems) { - this.RemoveMetadataMonitor(itemMetadata); - if (this.Filter(itemMetadata)) + RemoveMetadataMonitor(itemMetadata); + if (Filter(itemMetadata)) { - this.RemoveFromFilteredList(itemMetadata.Item); + RemoveFromFilteredList(itemMetadata.Item); } } break; default: - this.ResetAllMonitors(); - this.UpdateFilteredItemsList(); - this.NotifyReset(); + ResetAllMonitors(); + UpdateFilteredItemsList(); + NotifyReset(); break; } @@ -279,12 +279,12 @@ public class ViewsCollection : BindableBase, IViewsCollection public override int Compare(VisualElement x, VisualElement y) { - if (this.comparer == null) + if (comparer == null) { return 0; } - return this.comparer(x, y); + return comparer(x, y); } } diff --git a/src/Maui/Prism.Maui/Regions/Xaml/RegionManager.cs b/src/Maui/Prism.Maui/Navigation/Regions/Xaml/RegionManager.cs similarity index 97% rename from src/Maui/Prism.Maui/Regions/Xaml/RegionManager.cs rename to src/Maui/Prism.Maui/Navigation/Regions/Xaml/RegionManager.cs index 7ef770e2c6e53aef95dbfffc5fa81c89170dd72a..7675c562f2de7c13f47afda298be37d04944fbc3 100644 --- a/src/Maui/Prism.Maui/Regions/Xaml/RegionManager.cs +++ b/src/Maui/Prism.Maui/Navigation/Regions/Xaml/RegionManager.cs @@ -1,15 +1,13 @@ -using System.ComponentModel; -using System.Globalization; +using System.Globalization; using System.Reflection; using Prism.Common; using Prism.Events; -using Prism.Extensions; using Prism.Ioc; +using Prism.Navigation.Regions.Adapters; +using Prism.Navigation.Regions.Behaviors; using Prism.Properties; -using Prism.Regions.Adapters; -using Prism.Regions.Behaviors; -namespace Prism.Regions.Xaml; +namespace Prism.Navigation.Regions.Xaml; /// /// A class to provide Bindable Properties and helpers for Regions. @@ -58,7 +56,7 @@ public static class RegionManager public static readonly BindableProperty DefaultViewProperty = BindableProperty.CreateAttached("DefaultView", typeof(object), typeof(RegionManager), null); - public static void SetDefaultView(VisualElement regionTarget, object viewNameTypeOrInstance) => + public static void SetDefaultView(VisualElement regionTarget, object viewNameTypeOrInstance) => regionTarget.SetValue(DefaultViewProperty, viewNameTypeOrInstance); public static object GetDefaultView(VisualElement regionTarget) => diff --git a/src/Maui/Prism.Maui/PrismAppBuilder.cs b/src/Maui/Prism.Maui/PrismAppBuilder.cs index 15e92de34c1bb2878738781a73a4e58878ba974a..0f872aca8ea2912222b7b2f599a0b516b2551af5 100644 --- a/src/Maui/Prism.Maui/PrismAppBuilder.cs +++ b/src/Maui/Prism.Maui/PrismAppBuilder.cs @@ -9,9 +9,9 @@ using Prism.Ioc; using Prism.Modularity; using Prism.Mvvm; using Prism.Navigation; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Adapters; using Prism.Navigation.Xaml; -using Prism.Regions; -using Prism.Regions.Adapters; using Prism.Services; using TabbedPage = Microsoft.Maui.Controls.TabbedPage; diff --git a/src/Maui/Prism.Maui/Properties/AssemblyInfo.cs b/src/Maui/Prism.Maui/Properties/AssemblyInfo.cs index 1436f25f18edb2fbb86f8fb7c6f4735b2ec7badf..0938be8a6b707c750a6862b4e01b700d35df3542 100644 --- a/src/Maui/Prism.Maui/Properties/AssemblyInfo.cs +++ b/src/Maui/Prism.Maui/Properties/AssemblyInfo.cs @@ -7,6 +7,6 @@ [assembly: XmlnsDefinition("http://prismlibrary.com", "Prism.Modularity")] [assembly: XmlnsDefinition("http://prismlibrary.com", "Prism.Mvvm")] [assembly: XmlnsDefinition("http://prismlibrary.com", "Prism.Navigation.Xaml")] -[assembly: XmlnsDefinition("http://prismlibrary.com", "Prism.Regions.Xaml")] +[assembly: XmlnsDefinition("http://prismlibrary.com", "Prism.Navigation.Regions.Xaml")] [assembly: XmlnsDefinition("http://prismlibrary.com", "Prism.Dialogs.Xaml")] [assembly: XmlnsDefinition("http://prismlibrary.com", "Prism.Xaml")] diff --git a/src/Prism.Core/Navigation/INavigationResult.cs b/src/Prism.Core/Navigation/INavigationResult.cs index aef44b44b36864a91a731e9046b7661fb5d2cb8b..defbfadd0e3d7d90dc0fb3d8d1a4a09efbd7aaab 100644 --- a/src/Prism.Core/Navigation/INavigationResult.cs +++ b/src/Prism.Core/Navigation/INavigationResult.cs @@ -1,5 +1,5 @@ using System; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism.Navigation; diff --git a/src/Prism.Core/Navigation/NavigationResult.cs b/src/Prism.Core/Navigation/NavigationResult.cs index ea0d3280c28f0d15fd9d044cd6a9f653ebd9d382..19318edfdc5ff73d9498c5d0552833aee8e19964 100644 --- a/src/Prism.Core/Navigation/NavigationResult.cs +++ b/src/Prism.Core/Navigation/NavigationResult.cs @@ -1,5 +1,5 @@ using System; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism.Navigation; diff --git a/src/Prism.Core/Regions/IConfirmNavigationRequest.cs b/src/Prism.Core/Navigation/Regions/IConfirmNavigationRequest.cs similarity index 96% rename from src/Prism.Core/Regions/IConfirmNavigationRequest.cs rename to src/Prism.Core/Navigation/Regions/IConfirmNavigationRequest.cs index 5cf3c386e6fbf1171e8d9fc85b54f7ee82cec3cb..49083b1dd0f2c327176e6bef18cddb0dd2e84363 100644 --- a/src/Prism.Core/Regions/IConfirmNavigationRequest.cs +++ b/src/Prism.Core/Navigation/Regions/IConfirmNavigationRequest.cs @@ -1,6 +1,6 @@ using System; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Provides a way for objects involved in navigation to determine if a navigation request should continue. diff --git a/src/Prism.Core/Regions/IJournalAware.cs b/src/Prism.Core/Navigation/Regions/IJournalAware.cs similarity index 92% rename from src/Prism.Core/Regions/IJournalAware.cs rename to src/Prism.Core/Navigation/Regions/IJournalAware.cs index dc80eaa30b5d0f28e1bb52331c7a3730a9ce4e35..446aa4fff7108274723f85a275410d92b6c4eca9 100644 --- a/src/Prism.Core/Regions/IJournalAware.cs +++ b/src/Prism.Core/Navigation/Regions/IJournalAware.cs @@ -1,4 +1,4 @@ -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Provides a way for objects involved in navigation to opt-out of being added to the IRegionNavigationJournal backstack. diff --git a/src/Prism.Core/Regions/INavigateAsync.cs b/src/Prism.Core/Navigation/Regions/INavigateAsync.cs similarity index 91% rename from src/Prism.Core/Regions/INavigateAsync.cs rename to src/Prism.Core/Navigation/Regions/INavigateAsync.cs index 70efdf8f3b02fa592c111685355ffc7b3aa44c6d..9fbea95ec9302744ac35ec8abb0d017475586d9c 100644 --- a/src/Prism.Core/Regions/INavigateAsync.cs +++ b/src/Prism.Core/Navigation/Regions/INavigateAsync.cs @@ -1,13 +1,13 @@ using System; using Prism.Navigation; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Provides methods to perform navigation. /// /// - /// Convenience overloads for the methods in this interface can be found as extension methods on the + /// Convenience overloads for the methods in this interface can be found as extension methods on the /// class. /// public interface INavigateAsync @@ -19,7 +19,7 @@ namespace Prism.Regions /// The callback executed when the navigation request is completed. /// The navigation parameters specific to the navigation request. /// - /// Convenience overloads for this method can be found as extension methods on the + /// Convenience overloads for this method can be found as extension methods on the /// class. /// void RequestNavigate(Uri target, Action navigationCallback, INavigationParameters navigationParameters); diff --git a/src/Prism.Core/Regions/IRegion.cs b/src/Prism.Core/Navigation/Regions/IRegion.cs similarity index 99% rename from src/Prism.Core/Regions/IRegion.cs rename to src/Prism.Core/Navigation/Regions/IRegion.cs index 205a743279487fe4f62290d3fbebc4f5068a7b45..5ff4fe0fc3b5d1e55d3ddf408b649479ca5c1ee4 100644 --- a/src/Prism.Core/Regions/IRegion.cs +++ b/src/Prism.Core/Navigation/Regions/IRegion.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Defines a model that can be used to compose views. diff --git a/src/Prism.Core/Regions/IRegionAdapter.cs b/src/Prism.Core/Navigation/Regions/IRegionAdapter.cs similarity index 94% rename from src/Prism.Core/Regions/IRegionAdapter.cs rename to src/Prism.Core/Navigation/Regions/IRegionAdapter.cs index b08c6f266d24cc9fd792d3f7a51704b171c75462..455b186a2038b983d54d9eb293e23eead5c8876d 100644 --- a/src/Prism.Core/Regions/IRegionAdapter.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionAdapter.cs @@ -1,4 +1,4 @@ -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Defines an interfaces to adapt an object and bind it to a new . diff --git a/src/Prism.Core/Regions/IRegionAware.cs b/src/Prism.Core/Navigation/Regions/IRegionAware.cs similarity index 97% rename from src/Prism.Core/Regions/IRegionAware.cs rename to src/Prism.Core/Navigation/Regions/IRegionAware.cs index dc0a912210a9dbee4396e5f443680c8f1d794911..ce6f51e2a9f73af75ea94af4ee97eb5ae8476971 100644 --- a/src/Prism.Core/Regions/IRegionAware.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionAware.cs @@ -1,4 +1,4 @@ -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Provides a way for objects involved in navigation to be notified of navigation activities. diff --git a/src/Prism.Core/Regions/IRegionBehavior.cs b/src/Prism.Core/Navigation/Regions/IRegionBehavior.cs similarity index 92% rename from src/Prism.Core/Regions/IRegionBehavior.cs rename to src/Prism.Core/Navigation/Regions/IRegionBehavior.cs index b5113463c592314d3db9f0da30edbacca2161815..0aeb6b3853db6fdd0f9811fcee12aba2d44bbdbd 100644 --- a/src/Prism.Core/Regions/IRegionBehavior.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionBehavior.cs @@ -1,4 +1,4 @@ -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Interface for allowing extensible behavior on regions. diff --git a/src/Prism.Core/Regions/IRegionBehaviorCollection.cs b/src/Prism.Core/Navigation/Regions/IRegionBehaviorCollection.cs similarity index 89% rename from src/Prism.Core/Regions/IRegionBehaviorCollection.cs rename to src/Prism.Core/Navigation/Regions/IRegionBehaviorCollection.cs index 02aad070f88dd89dd6d5d18c88ddba1a825e1aea..7f7e82a5c11c12af44852f9d6d1cb2cfbb217c04 100644 --- a/src/Prism.Core/Regions/IRegionBehaviorCollection.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionBehaviorCollection.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Defines the interface for a collection of classes on a Region. @@ -9,16 +9,16 @@ namespace Prism.Regions { /// - /// Adds a to the collection, using the specified key as an indexer. + /// Adds a to the collection, using the specified key as an indexer. /// /// - /// The key that specifies the type of that's added. + /// The key that specifies the type of that's added. /// /// The to add. void Add(string key, IRegionBehavior regionBehavior); /// - /// Checks if a with the specified key is already present. + /// Checks if a with the specified key is already present. /// /// The key to use to find a particular . /// diff --git a/src/Prism.Core/Regions/IRegionBehaviorFactory.cs b/src/Prism.Core/Navigation/Regions/IRegionBehaviorFactory.cs similarity index 97% rename from src/Prism.Core/Regions/IRegionBehaviorFactory.cs rename to src/Prism.Core/Navigation/Regions/IRegionBehaviorFactory.cs index 064d171fa486c358cf9acdf3a4a62c77b7c829bd..2ce6ab0ecc1a62147fac0302567730949a1f968f 100644 --- a/src/Prism.Core/Regions/IRegionBehaviorFactory.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionBehaviorFactory.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Interface for RegionBehaviorFactories. This factory allows the registration of the default set of RegionBehaviors, that will diff --git a/src/Prism.Core/Regions/IRegionBehaviorFactoryExtensions.cs b/src/Prism.Core/Navigation/Regions/IRegionBehaviorFactoryExtensions.cs similarity index 97% rename from src/Prism.Core/Regions/IRegionBehaviorFactoryExtensions.cs rename to src/Prism.Core/Navigation/Regions/IRegionBehaviorFactoryExtensions.cs index d0eb120136e5b061f9dd56b94b21a012a6526551..0659fe750208fe5cd94347e47c207e976dd4c173 100644 --- a/src/Prism.Core/Regions/IRegionBehaviorFactoryExtensions.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionBehaviorFactoryExtensions.cs @@ -1,4 +1,4 @@ -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Extension methods for the IRegionBehaviorFactory. diff --git a/src/Prism.Core/Regions/IRegionCollection.cs b/src/Prism.Core/Navigation/Regions/IRegionCollection.cs similarity index 97% rename from src/Prism.Core/Regions/IRegionCollection.cs rename to src/Prism.Core/Navigation/Regions/IRegionCollection.cs index a762376d9f7084fae1aae85308427a780454e458..628626cba70cd616f0d6dad20b01849a7b0b3ac7 100644 --- a/src/Prism.Core/Regions/IRegionCollection.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionCollection.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Collections.Specialized; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Defines a collection of uniquely identified by their Name. @@ -40,7 +40,7 @@ namespace Prism.Regions /// Adds a region to the with the name received as argument. /// /// The name to be given to the region. - /// The region to be added to the . + /// The region to be added to the . /// Thrown if is . /// Thrown if and 's name do not match and the is not . void Add(string regionName, IRegion region); diff --git a/src/Prism.Core/Regions/IRegionManager.cs b/src/Prism.Core/Navigation/Regions/IRegionManager.cs similarity index 99% rename from src/Prism.Core/Regions/IRegionManager.cs rename to src/Prism.Core/Navigation/Regions/IRegionManager.cs index 40f92873125cdb657b974bdbb4dd048f35a006ac..a9774655709f6b772eb0d183d7312fcb821f2a2d 100644 --- a/src/Prism.Core/Regions/IRegionManager.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionManager.cs @@ -2,7 +2,7 @@ using System; using Prism.Ioc; using Prism.Navigation; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Defines an interface to manage a set of regions and to attach regions to objects (typically controls). diff --git a/src/Prism.Core/Regions/IRegionManagerExtensions.cs b/src/Prism.Core/Navigation/Regions/IRegionManagerExtensions.cs similarity index 99% rename from src/Prism.Core/Regions/IRegionManagerExtensions.cs rename to src/Prism.Core/Navigation/Regions/IRegionManagerExtensions.cs index 6f70b1e6f12aba4aedf94260acda680480cdc0bb..87aad75fdd98610894ead30731b70db36d1018df 100644 --- a/src/Prism.Core/Regions/IRegionManagerExtensions.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionManagerExtensions.cs @@ -1,7 +1,7 @@ using System; using Prism.Navigation; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Common Extensions for the RegionManager diff --git a/src/Prism.Core/Regions/IRegionMemberLifetime.cs b/src/Prism.Core/Navigation/Regions/IRegionMemberLifetime.cs similarity index 93% rename from src/Prism.Core/Regions/IRegionMemberLifetime.cs rename to src/Prism.Core/Navigation/Regions/IRegionMemberLifetime.cs index b6d8b43149b68e17940739cf663e8daab8aff8f4..bc2ab7c7601f82acc46d93837e787a8c6742f82d 100644 --- a/src/Prism.Core/Regions/IRegionMemberLifetime.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionMemberLifetime.cs @@ -1,4 +1,4 @@ -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// When implemented, allows an instance placed in a diff --git a/src/Prism.Core/Regions/IRegionNavigationContentLoader.cs b/src/Prism.Core/Navigation/Regions/IRegionNavigationContentLoader.cs similarity index 96% rename from src/Prism.Core/Regions/IRegionNavigationContentLoader.cs rename to src/Prism.Core/Navigation/Regions/IRegionNavigationContentLoader.cs index 6487586c9144ec1566aa029e7467e10fc1d7c0f2..a2553e591e9cab1795e0ef817535c751aa189f70 100644 --- a/src/Prism.Core/Regions/IRegionNavigationContentLoader.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionNavigationContentLoader.cs @@ -1,6 +1,6 @@ using System; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Identifies the view in a region that is the target of a navigation request. diff --git a/src/Prism.Core/Regions/IRegionNavigationJournal.cs b/src/Prism.Core/Navigation/Regions/IRegionNavigationJournal.cs similarity index 98% rename from src/Prism.Core/Regions/IRegionNavigationJournal.cs rename to src/Prism.Core/Navigation/Regions/IRegionNavigationJournal.cs index 32590e030231ad45f64587ec76362459f655476c..f7709e74ab5553bf0103338e71c1fc92cf9c1868 100644 --- a/src/Prism.Core/Regions/IRegionNavigationJournal.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionNavigationJournal.cs @@ -1,4 +1,4 @@ -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Provides journaling of current, back, and forward navigation within regions. diff --git a/src/Prism.Core/Regions/IRegionNavigationJournalEntry.cs b/src/Prism.Core/Navigation/Regions/IRegionNavigationJournalEntry.cs similarity index 93% rename from src/Prism.Core/Regions/IRegionNavigationJournalEntry.cs rename to src/Prism.Core/Navigation/Regions/IRegionNavigationJournalEntry.cs index ae04db3d8a44249cc8091e447092cbc2df92ab64..7226e2348286cef169b91341b081eda2a479910b 100644 --- a/src/Prism.Core/Regions/IRegionNavigationJournalEntry.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionNavigationJournalEntry.cs @@ -1,7 +1,7 @@ using System; using Prism.Navigation; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// An entry in an IRegionNavigationJournal representing the URI navigated to. diff --git a/src/Prism.Core/Regions/IRegionNavigationRegistry.cs b/src/Prism.Core/Navigation/Regions/IRegionNavigationRegistry.cs similarity index 70% rename from src/Prism.Core/Regions/IRegionNavigationRegistry.cs rename to src/Prism.Core/Navigation/Regions/IRegionNavigationRegistry.cs index c3470312d237409aaafe64ebefbda3b45e27a992..e82a602cb91b15b6880888db7f9b45cb6b4a19e0 100644 --- a/src/Prism.Core/Regions/IRegionNavigationRegistry.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionNavigationRegistry.cs @@ -1,5 +1,5 @@ using Prism.Mvvm; -namespace Prism.Regions; +namespace Prism.Navigation.Regions; public interface IRegionNavigationRegistry : IViewRegistry { } diff --git a/src/Prism.Core/Regions/IRegionNavigationService.cs b/src/Prism.Core/Navigation/Regions/IRegionNavigationService.cs similarity index 96% rename from src/Prism.Core/Regions/IRegionNavigationService.cs rename to src/Prism.Core/Navigation/Regions/IRegionNavigationService.cs index f402b2207b98b9af217594c95efd04986dec6efc..dff55aa25391d775426edceada47d68e076fb86a 100644 --- a/src/Prism.Core/Regions/IRegionNavigationService.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionNavigationService.cs @@ -1,6 +1,6 @@ using System; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Provides navigation for regions. diff --git a/src/Prism.Core/Regions/IRegionViewRegistry.cs b/src/Prism.Core/Navigation/Regions/IRegionViewRegistry.cs similarity index 97% rename from src/Prism.Core/Regions/IRegionViewRegistry.cs rename to src/Prism.Core/Navigation/Regions/IRegionViewRegistry.cs index 27dca489c155b5d1b529ce29edea6b19c7457c08..9f0af013a1d65a66df3ab7ca9f2b1ad016b5985c 100644 --- a/src/Prism.Core/Regions/IRegionViewRegistry.cs +++ b/src/Prism.Core/Navigation/Regions/IRegionViewRegistry.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using Prism.Ioc; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Defines the interface for the registry of region's content. @@ -44,7 +44,7 @@ namespace Prism.Regions void RegisterViewWithRegion(string regionName, Type viewType); /// - /// Registers a delegate that can be used to retrieve the content associated with a region name. + /// Registers a delegate that can be used to retrieve the content associated with a region name. /// /// Region name to which the will be registered. /// Delegate used to retrieve the content associated with the . diff --git a/src/Prism.Core/Regions/IViewsCollection.cs b/src/Prism.Core/Navigation/Regions/IViewsCollection.cs similarity index 94% rename from src/Prism.Core/Regions/IViewsCollection.cs rename to src/Prism.Core/Navigation/Regions/IViewsCollection.cs index dea55f3b4ce1a988234e89b4e7c8936d36d45e66..d7974de538461bdc76e59673fa82bf5f4d99cafe 100644 --- a/src/Prism.Core/Regions/IViewsCollection.cs +++ b/src/Prism.Core/Navigation/Regions/IViewsCollection.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Collections.Specialized; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Defines a view of a collection. diff --git a/src/Prism.Core/Regions/NavigationAsyncExtensions.cs b/src/Prism.Core/Navigation/Regions/NavigationAsyncExtensions.cs similarity index 98% rename from src/Prism.Core/Regions/NavigationAsyncExtensions.cs rename to src/Prism.Core/Navigation/Regions/NavigationAsyncExtensions.cs index 4a3bac62efc0bb4f8070e61549c8524c9e9f9733..07f380c365c355956cc458397e1fb8bc3dd9f9f3 100644 --- a/src/Prism.Core/Regions/NavigationAsyncExtensions.cs +++ b/src/Prism.Core/Navigation/Regions/NavigationAsyncExtensions.cs @@ -1,7 +1,7 @@ using System; using Prism.Navigation; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Provides additional methods to the interface. @@ -15,7 +15,7 @@ namespace Prism.Regions /// The navigation target /// The callback executed when the navigation request is completed. /// - /// Convenience overloads for this method can be found as extension methods on the + /// Convenience overloads for this method can be found as extension methods on the /// class. /// public static void RequestNavigate(this INavigateAsync navigation, Uri target, Action navigationCallback) => diff --git a/src/Prism.Core/Regions/NavigationContext.cs b/src/Prism.Core/Navigation/Regions/NavigationContext.cs similarity index 95% rename from src/Prism.Core/Regions/NavigationContext.cs rename to src/Prism.Core/Navigation/Regions/NavigationContext.cs index 7cac314efc27d001e6ba6b1d8cfd8654e20a689a..b39d15a016754f23d45b4b171e0d4fd0b3f64b47 100644 --- a/src/Prism.Core/Regions/NavigationContext.cs +++ b/src/Prism.Core/Navigation/Regions/NavigationContext.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Prism.Common; using Prism.Navigation; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Encapsulates information about a navigation request. @@ -11,7 +11,7 @@ namespace Prism.Regions public class NavigationContext { /// - /// Initializes a new instance of the class for a region name and a + /// Initializes a new instance of the class for a region name and a /// . /// /// The navigation service. @@ -21,7 +21,7 @@ namespace Prism.Regions } /// - /// Initializes a new instance of the class for a region name and a + /// Initializes a new instance of the class for a region name and a /// . /// /// The navigation service. diff --git a/src/Prism.Core/Regions/NavigationContextExtensions.cs b/src/Prism.Core/Navigation/Regions/NavigationContextExtensions.cs similarity index 95% rename from src/Prism.Core/Regions/NavigationContextExtensions.cs rename to src/Prism.Core/Navigation/Regions/NavigationContextExtensions.cs index 2d08307ce4b369ad4468a51ae3fde8e916ca9d99..f4bc99060af71cb6301aa5d7d7f4a044160a4525 100644 --- a/src/Prism.Core/Regions/NavigationContextExtensions.cs +++ b/src/Prism.Core/Navigation/Regions/NavigationContextExtensions.cs @@ -1,6 +1,6 @@ using Prism.Common; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Provides extensions for the Navigation Context diff --git a/src/Prism.Core/Regions/RegionBehavior.cs b/src/Prism.Core/Navigation/Regions/RegionBehavior.cs similarity index 97% rename from src/Prism.Core/Regions/RegionBehavior.cs rename to src/Prism.Core/Navigation/Regions/RegionBehavior.cs index 85a184b14d07d62c72acf01268e6b00e7ed21056..8020d77ab3009259389a5066e0c27ca5359862c1 100644 --- a/src/Prism.Core/Regions/RegionBehavior.cs +++ b/src/Prism.Core/Navigation/Regions/RegionBehavior.cs @@ -1,7 +1,7 @@ using System; using Prism.Properties; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Provides a base class for region's behaviors. diff --git a/src/Prism.Core/Regions/RegionBehaviorCollection.cs b/src/Prism.Core/Navigation/Regions/RegionBehaviorCollection.cs similarity index 99% rename from src/Prism.Core/Regions/RegionBehaviorCollection.cs rename to src/Prism.Core/Navigation/Regions/RegionBehaviorCollection.cs index 0b5c089bc0fd174307aa7d399560438b7e89d54d..eb7889b66754165da0e574e5ac12243ff362780e 100644 --- a/src/Prism.Core/Regions/RegionBehaviorCollection.cs +++ b/src/Prism.Core/Navigation/Regions/RegionBehaviorCollection.cs @@ -2,7 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// A collection of instances, that are stored and retrieved by Key. diff --git a/src/Prism.Core/Regions/RegionBehaviorFactory.cs b/src/Prism.Core/Navigation/Regions/RegionBehaviorFactory.cs similarity index 99% rename from src/Prism.Core/Regions/RegionBehaviorFactory.cs rename to src/Prism.Core/Navigation/Regions/RegionBehaviorFactory.cs index 8caaa17f95cbafb47564bcac24df664f393bee04..e0766d93ca953631c6440e39590262aa243b926b 100644 --- a/src/Prism.Core/Regions/RegionBehaviorFactory.cs +++ b/src/Prism.Core/Navigation/Regions/RegionBehaviorFactory.cs @@ -5,7 +5,7 @@ using System.Threading; using Prism.Ioc; using Prism.Properties; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Defines a factory that allows the registration of the default set of , that will diff --git a/src/Prism.Core/Regions/RegionCreationException.cs b/src/Prism.Core/Navigation/Regions/RegionCreationException.cs similarity index 95% rename from src/Prism.Core/Regions/RegionCreationException.cs rename to src/Prism.Core/Navigation/Regions/RegionCreationException.cs index 5e7d62a9bc28935341434014ef74f30a3e62fca7..6fd9cff532135e6d60ef9b777e303deae0bfe361 100644 --- a/src/Prism.Core/Regions/RegionCreationException.cs +++ b/src/Prism.Core/Navigation/Regions/RegionCreationException.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Runtime.Serialization; using System.Text; -namespace Prism.Regions; +namespace Prism.Navigation.Regions; /// /// An exception used when encountering an error in the creation of a Region diff --git a/src/Prism.Core/Regions/RegionException.cs b/src/Prism.Core/Navigation/Regions/RegionException.cs similarity index 94% rename from src/Prism.Core/Regions/RegionException.cs rename to src/Prism.Core/Navigation/Regions/RegionException.cs index e2103f093f12bf9b62c057dad2b93d28ac39cd4b..85a56cf9765577dc7f11bafd5ca16d1763c4a2c9 100644 --- a/src/Prism.Core/Regions/RegionException.cs +++ b/src/Prism.Core/Navigation/Regions/RegionException.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -namespace Prism.Regions; +namespace Prism.Navigation.Regions; /// /// Provides a common base class for Region Exceptions diff --git a/src/Prism.Core/Regions/RegionMemberLifetimeAttribute.cs b/src/Prism.Core/Navigation/Regions/RegionMemberLifetimeAttribute.cs similarity index 96% rename from src/Prism.Core/Regions/RegionMemberLifetimeAttribute.cs rename to src/Prism.Core/Navigation/Regions/RegionMemberLifetimeAttribute.cs index fa8feabe48da67c0411dd8787dd977784aa59fca..7e2e6067e6b4e0b98b5c3aeeb96afa887f0d9765 100644 --- a/src/Prism.Core/Regions/RegionMemberLifetimeAttribute.cs +++ b/src/Prism.Core/Navigation/Regions/RegionMemberLifetimeAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// When is applied to class provides data diff --git a/src/Prism.Core/Regions/RegionNavigationEventArgs.cs b/src/Prism.Core/Navigation/Regions/RegionNavigationEventArgs.cs similarity index 96% rename from src/Prism.Core/Regions/RegionNavigationEventArgs.cs rename to src/Prism.Core/Navigation/Regions/RegionNavigationEventArgs.cs index 34b57ff0f05f7dbe554d74bf1ae7a92cf8467d8e..53b11a6ec9bb4b9eecf0338d826d0b713efede47 100644 --- a/src/Prism.Core/Regions/RegionNavigationEventArgs.cs +++ b/src/Prism.Core/Navigation/Regions/RegionNavigationEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// EventArgs used with the Navigated event. diff --git a/src/Prism.Core/Regions/RegionNavigationFailedEventArgs.cs b/src/Prism.Core/Navigation/Regions/RegionNavigationFailedEventArgs.cs similarity index 98% rename from src/Prism.Core/Regions/RegionNavigationFailedEventArgs.cs rename to src/Prism.Core/Navigation/Regions/RegionNavigationFailedEventArgs.cs index 22117cf9eee24ed1703a32e5466b6f1602c90c99..72f5c7188f7a4c7a4351f9535deb00247ce55fc8 100644 --- a/src/Prism.Core/Regions/RegionNavigationFailedEventArgs.cs +++ b/src/Prism.Core/Navigation/Regions/RegionNavigationFailedEventArgs.cs @@ -1,6 +1,6 @@ using System; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// EventArgs used with the NavigationFailed event. diff --git a/src/Prism.Core/Regions/RegionNavigationJournal.cs b/src/Prism.Core/Navigation/Regions/RegionNavigationJournal.cs similarity index 98% rename from src/Prism.Core/Regions/RegionNavigationJournal.cs rename to src/Prism.Core/Navigation/Regions/RegionNavigationJournal.cs index bce7af269a2a24ac32e5d3b19083b4473ffa471a..1ec8654fa384177a62d79bdb876b44a46bbeaef7 100644 --- a/src/Prism.Core/Regions/RegionNavigationJournal.cs +++ b/src/Prism.Core/Navigation/Regions/RegionNavigationJournal.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// - /// Provides journaling of current, back, and forward navigation within regions. + /// Provides journaling of current, back, and forward navigation within regions. /// public class RegionNavigationJournal : IRegionNavigationJournal { diff --git a/src/Prism.Core/Regions/RegionNavigationJournalEntry.cs b/src/Prism.Core/Navigation/Regions/RegionNavigationJournalEntry.cs similarity index 96% rename from src/Prism.Core/Regions/RegionNavigationJournalEntry.cs rename to src/Prism.Core/Navigation/Regions/RegionNavigationJournalEntry.cs index 2c5427cd9009fd28d4ced4a113ea02914fc67ae8..d9b7ec6dc58de320ac279ed93be4511ebf813d2d 100644 --- a/src/Prism.Core/Regions/RegionNavigationJournalEntry.cs +++ b/src/Prism.Core/Navigation/Regions/RegionNavigationJournalEntry.cs @@ -2,7 +2,7 @@ using System; using System.Globalization; using Prism.Navigation; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// An entry in an IRegionNavigationJournal representing the URI navigated to. diff --git a/src/Prism.Core/Regions/RegionViewRegistryExtensions.cs b/src/Prism.Core/Navigation/Regions/RegionViewRegistryExtensions.cs similarity index 95% rename from src/Prism.Core/Regions/RegionViewRegistryExtensions.cs rename to src/Prism.Core/Navigation/Regions/RegionViewRegistryExtensions.cs index a4e3188d43d8f33b9c4535a24ca7fe575c004df7..ec120af447af3c242f28ac5f5fedbb3dc5506352 100644 --- a/src/Prism.Core/Regions/RegionViewRegistryExtensions.cs +++ b/src/Prism.Core/Navigation/Regions/RegionViewRegistryExtensions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Prism.Ioc; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Provides extensions for the . @@ -10,7 +10,7 @@ namespace Prism.Regions public static class RegionViewRegistryExtensions { /// - /// Registers a delegate that can be used to retrieve the content associated with a region name. + /// Registers a delegate that can be used to retrieve the content associated with a region name. /// /// The instance. /// Region name to which the will be registered. diff --git a/src/Prism.Core/Regions/SyncActiveStateAttribute.cs b/src/Prism.Core/Navigation/Regions/SyncActiveStateAttribute.cs similarity index 88% rename from src/Prism.Core/Regions/SyncActiveStateAttribute.cs rename to src/Prism.Core/Navigation/Regions/SyncActiveStateAttribute.cs index 8b0d84415976e42cc6b1e4280ef36619b0c98795..0c8be40824cd00a6f121ec69be1e4d620a4357f1 100644 --- a/src/Prism.Core/Regions/SyncActiveStateAttribute.cs +++ b/src/Prism.Core/Navigation/Regions/SyncActiveStateAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Defines that a view is synchronized with its parent view's Active state. diff --git a/src/Prism.Core/Regions/UpdateRegionsException.cs b/src/Prism.Core/Navigation/Regions/UpdateRegionsException.cs similarity index 95% rename from src/Prism.Core/Regions/UpdateRegionsException.cs rename to src/Prism.Core/Navigation/Regions/UpdateRegionsException.cs index 23ebe578e11a3862bce780853ae7d383530266ae..dcbb0606694236c92d627c8fcf0b7c49cdea74bd 100644 --- a/src/Prism.Core/Regions/UpdateRegionsException.cs +++ b/src/Prism.Core/Navigation/Regions/UpdateRegionsException.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Represents errors that occurred during the regions' update. @@ -26,11 +26,11 @@ namespace Prism.Regions } /// - /// Initializes a new instance of the class with a specified error message and a reference - /// to the inner exception that is the cause of this exception. + /// Initializes a new instance of the class with a specified error message and a reference + /// to the inner exception that is the cause of this exception. /// /// The error message that explains the reason for the exception. - /// The exception that is the cause of the current exception, or a null reference + /// The exception that is the cause of the current exception, or a null reference /// (Nothing in Visual Basic) if no inner exception is specified. public UpdateRegionsException(string message, Exception inner) : base(message, inner) diff --git a/src/Prism.Core/Regions/ViewRegisteredEventArgs.cs b/src/Prism.Core/Navigation/Regions/ViewRegisteredEventArgs.cs similarity index 96% rename from src/Prism.Core/Regions/ViewRegisteredEventArgs.cs rename to src/Prism.Core/Navigation/Regions/ViewRegisteredEventArgs.cs index 1b25eb5cd4dd1a825185102dca8896c47d497aca..0fe3bd80ded46fb72412aa9b0fe3b6a489f127c6 100644 --- a/src/Prism.Core/Regions/ViewRegisteredEventArgs.cs +++ b/src/Prism.Core/Navigation/Regions/ViewRegisteredEventArgs.cs @@ -1,7 +1,7 @@ using System; using Prism.Ioc; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Argument class used by the event when a new content is registered. diff --git a/src/Prism.Core/Regions/ViewRegistrationException.cs b/src/Prism.Core/Navigation/Regions/ViewRegistrationException.cs similarity index 96% rename from src/Prism.Core/Regions/ViewRegistrationException.cs rename to src/Prism.Core/Navigation/Regions/ViewRegistrationException.cs index b242cd90d42ccb76404b6bbd542fe28af78aed8b..d5263342a841ab8aa7bd722178d3ccfc01e5b280 100644 --- a/src/Prism.Core/Regions/ViewRegistrationException.cs +++ b/src/Prism.Core/Navigation/Regions/ViewRegistrationException.cs @@ -1,10 +1,10 @@ using System; using System.Runtime.Serialization; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// - /// Exception that's thrown when something goes wrong while Registering a View with a region name in the class. + /// Exception that's thrown when something goes wrong while Registering a View with a region name in the class. /// [Serializable] public partial class ViewRegistrationException : Exception @@ -44,7 +44,7 @@ namespace Prism.Regions /// /// Initializes a new instance of the class with serialized data. /// - /// The that holds the serialized + /// The that holds the serialized /// object data about the exception being thrown. /// The that contains contextual information about the source or destination. protected ViewRegistrationException(SerializationInfo info, StreamingContext context) diff --git a/src/Prism.Core/Regions/ViewSortHintAttribute.cs b/src/Prism.Core/Navigation/Regions/ViewSortHintAttribute.cs similarity index 95% rename from src/Prism.Core/Regions/ViewSortHintAttribute.cs rename to src/Prism.Core/Navigation/Regions/ViewSortHintAttribute.cs index d619af282f5eadfc37fdc32b294522557a3e92a5..6559a0eedff8d70bf0d4cbc8db0331e3c0719170 100644 --- a/src/Prism.Core/Regions/ViewSortHintAttribute.cs +++ b/src/Prism.Core/Navigation/Regions/ViewSortHintAttribute.cs @@ -1,7 +1,7 @@ using System; using System.Net; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Provides a hint from a view to a region on how to sort the view. diff --git a/src/Prism.Core/build/Package.targets b/src/Prism.Core/build/Package.targets index 5fd315f1488f1ad19319957663ed340dffc208b9..84a626eca203535aa13ba928a2dedcaf29dd8382 100644 --- a/src/Prism.Core/build/Package.targets +++ b/src/Prism.Core/build/Package.targets @@ -9,6 +9,6 @@ - + diff --git a/src/Uno/Prism.Uno/PrismApplicationBase.cs b/src/Uno/Prism.Uno/PrismApplicationBase.cs index 7fe5cbac0631af599583dd847dd648d9584dbdf9..4160a156113b9c900faa4a94e1ba214bed02631a 100644 --- a/src/Uno/Prism.Uno/PrismApplicationBase.cs +++ b/src/Uno/Prism.Uno/PrismApplicationBase.cs @@ -5,8 +5,7 @@ using Prism.Common; using Prism.Ioc; using Prism.Modularity; using Prism.Mvvm; -using Prism.Regions; -using Uno.Extensions.Hosting; +using Prism.Navigation.Regions; using Application = Microsoft.UI.Xaml.Application; #nullable enable @@ -132,8 +131,8 @@ namespace Prism void FinalizeInitialization() { - Regions.RegionManager.SetRegionManager(shell, _containerExtension.Resolve()); - Regions.RegionManager.UpdateRegions(); + Navigation.Regions.RegionManager.SetRegionManager(shell, _containerExtension.Resolve()); + Navigation.Regions.RegionManager.UpdateRegions(); _host = builder.Build(); InitializeModules(); OnInitialized(); diff --git a/src/Wpf/Prism.DryIoc.Wpf/PrismApplication.cs b/src/Wpf/Prism.DryIoc.Wpf/PrismApplication.cs index 56c41fe3f65dba17b0942e109df0eb2447e5f372..42d2d911a5a6431bcbb46b2d1dfead0f4ee128da 100644 --- a/src/Wpf/Prism.DryIoc.Wpf/PrismApplication.cs +++ b/src/Wpf/Prism.DryIoc.Wpf/PrismApplication.cs @@ -1,7 +1,7 @@ using System; using DryIoc; using Prism.Ioc; -using Prism.Regions; +using Prism.Navigation.Regions; using ExceptionExtensions = System.ExceptionExtensions; namespace Prism.DryIoc @@ -27,7 +27,7 @@ namespace Prism.DryIoc } /// - /// Registers the s of the Exceptions that are not considered + /// Registers the s of the Exceptions that are not considered /// root exceptions by the . /// protected override void RegisterFrameworkExceptionTypes() diff --git a/src/Wpf/Prism.Wpf/Regions/AllActiveRegion.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/AllActiveRegion.cs similarity index 96% rename from src/Wpf/Prism.Wpf/Regions/AllActiveRegion.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/AllActiveRegion.cs index 6216a7afe326702b95ef5548749acc5af595d3eb..92441b20e27925431504c18a6999f2a3f5e1285f 100644 --- a/src/Wpf/Prism.Wpf/Regions/AllActiveRegion.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/AllActiveRegion.cs @@ -1,7 +1,7 @@ using System; using Prism.Properties; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Region that keeps all the views in it as active. Deactivation of views is not allowed. diff --git a/src/Wpf/Prism.Wpf/Regions/Behaviors/AutoPopulateRegionBehavior.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/AutoPopulateRegionBehavior.cs similarity index 98% rename from src/Wpf/Prism.Wpf/Regions/Behaviors/AutoPopulateRegionBehavior.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/AutoPopulateRegionBehavior.cs index 3bee518451b6ae6960dd5bb9e80c69f751551502..a8accd4eaa4c7dbeb890689b7e4d11cedcfe6615 100644 --- a/src/Wpf/Prism.Wpf/Regions/Behaviors/AutoPopulateRegionBehavior.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/AutoPopulateRegionBehavior.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using Prism.Ioc; -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Populates the target region with the views registered to it in the . diff --git a/src/Wpf/Prism.Wpf/Regions/Behaviors/BindRegionContextToDependencyObjectBehavior.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/BindRegionContextToDependencyObjectBehavior.cs similarity index 98% rename from src/Wpf/Prism.Wpf/Regions/Behaviors/BindRegionContextToDependencyObjectBehavior.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/BindRegionContextToDependencyObjectBehavior.cs index 79abbd3d6fe44e1343605af91ac4a8a7634b9719..a90ddde8fbfc39658e8d5e407ab1421292269c1b 100644 --- a/src/Wpf/Prism.Wpf/Regions/Behaviors/BindRegionContextToDependencyObjectBehavior.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/BindRegionContextToDependencyObjectBehavior.cs @@ -1,5 +1,3 @@ - - using Prism.Common; using System.Collections; using System.Collections.Specialized; @@ -11,7 +9,7 @@ using Microsoft.UI.Xaml; using System.Windows; #endif -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Defines a behavior that forwards the diff --git a/src/Wpf/Prism.Wpf/Regions/Behaviors/ClearChildViewsRegionBehavior.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/ClearChildViewsRegionBehavior.cs similarity index 98% rename from src/Wpf/Prism.Wpf/Regions/Behaviors/ClearChildViewsRegionBehavior.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/ClearChildViewsRegionBehavior.cs index 286e014bcc0894f173a338e879d8a4c1ea1b7cd7..040a4701d20c7cd2eb91f2236161f6c981bb6946 100644 --- a/src/Wpf/Prism.Wpf/Regions/Behaviors/ClearChildViewsRegionBehavior.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/ClearChildViewsRegionBehavior.cs @@ -1,5 +1,3 @@ - - using System; #if HAS_WINUI @@ -8,7 +6,7 @@ using Microsoft.UI.Xaml; using System.Windows; #endif -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Behavior that removes the RegionManager attached property of all the views in a region once the RegionManager property of a region becomes null. diff --git a/src/Wpf/Prism.Wpf/Regions/Behaviors/DelayedRegionCreationBehavior.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/DelayedRegionCreationBehavior.cs similarity index 99% rename from src/Wpf/Prism.Wpf/Regions/Behaviors/DelayedRegionCreationBehavior.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/DelayedRegionCreationBehavior.cs index a703c60d874d0206613b8b84cfdb0c64fa656b17..994fbc4d0ed8920cc8bbbdc7ea3f1dcd00a49396 100644 --- a/src/Wpf/Prism.Wpf/Regions/Behaviors/DelayedRegionCreationBehavior.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/DelayedRegionCreationBehavior.cs @@ -10,7 +10,7 @@ using Microsoft.UI.Xaml; using System.Windows; #endif -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Behavior that creates a new , when the control that will host the (see ) diff --git a/src/Wpf/Prism.Wpf/Regions/Behaviors/DestructibleRegionBehavior.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/DestructibleRegionBehavior.cs similarity index 95% rename from src/Wpf/Prism.Wpf/Regions/Behaviors/DestructibleRegionBehavior.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/DestructibleRegionBehavior.cs index eedfeee515b32f88f7902dcdfb6582df52431cb0..47252c3610502aa8d2419c1a77ee7e47204e83c9 100644 --- a/src/Wpf/Prism.Wpf/Regions/Behaviors/DestructibleRegionBehavior.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/DestructibleRegionBehavior.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Specialized; using Prism.Common; -using Prism.Navigation; -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Calls on Views and ViewModels diff --git a/src/Wpf/Prism.Wpf/Regions/Behaviors/IHostAwareRegionBehavior.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/IHostAwareRegionBehavior.cs similarity index 94% rename from src/Wpf/Prism.Wpf/Regions/Behaviors/IHostAwareRegionBehavior.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/IHostAwareRegionBehavior.cs index 20f2b5162f458c3af418d839b31640ad3680beb4..ee303ac768859fd88bb61ae002fc521d471ad606 100644 --- a/src/Wpf/Prism.Wpf/Regions/Behaviors/IHostAwareRegionBehavior.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/IHostAwareRegionBehavior.cs @@ -1,12 +1,10 @@ - - #if HAS_WINUI using Microsoft.UI.Xaml; #else using System.Windows; #endif -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Defines a that not allows extensible behaviors on regions which also interact diff --git a/src/Wpf/Prism.Wpf/Regions/Behaviors/RegionActiveAwareBehavior.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/RegionActiveAwareBehavior.cs similarity index 95% rename from src/Wpf/Prism.Wpf/Regions/Behaviors/RegionActiveAwareBehavior.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/RegionActiveAwareBehavior.cs index 0783187bb7c219451f74a35cd2420621ada991c5..dc9866dab9eff9b6f5d21a2413fa2714e4290587 100644 --- a/src/Wpf/Prism.Wpf/Regions/Behaviors/RegionActiveAwareBehavior.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/RegionActiveAwareBehavior.cs @@ -1,9 +1,6 @@ - - using System; using System.Collections.Specialized; using System.Linq; -using System.Reflection; using Prism.Common; #if HAS_WINUI @@ -12,7 +9,7 @@ using Microsoft.UI.Xaml; using System.Windows; #endif -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Behavior that monitors a object and @@ -22,7 +19,7 @@ namespace Prism.Regions.Behaviors /// /// /// This class can also sync the active state for any scoped regions directly on the view based on the . - /// If you use the method with the createRegionManagerScope option, the scoped manager will be attached to the view. + /// If you use the method with the createRegionManagerScope option, the scoped manager will be attached to the view. /// public class RegionActiveAwareBehavior : IRegionBehavior { diff --git a/src/Wpf/Prism.Wpf/Regions/Behaviors/RegionManagerRegistrationBehavior.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/RegionManagerRegistrationBehavior.cs similarity index 98% rename from src/Wpf/Prism.Wpf/Regions/Behaviors/RegionManagerRegistrationBehavior.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/RegionManagerRegistrationBehavior.cs index 68521b47521933a439e0de762c05759ec1e5d911..0f42de884a80868610fe9ba19b3129927c3d6086 100644 --- a/src/Wpf/Prism.Wpf/Regions/Behaviors/RegionManagerRegistrationBehavior.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/RegionManagerRegistrationBehavior.cs @@ -1,9 +1,6 @@ - - using System; using System.ComponentModel; using Prism.Properties; -using System.Globalization; #if HAS_WINUI using Microsoft.UI.Xaml; @@ -12,7 +9,7 @@ using Microsoft.UI.Xaml.Media; using System.Windows; #endif -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Subscribes to a static event from the in order to register the target diff --git a/src/Wpf/Prism.Wpf/Regions/Behaviors/RegionMemberLifetimeBehavior.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/RegionMemberLifetimeBehavior.cs similarity index 99% rename from src/Wpf/Prism.Wpf/Regions/Behaviors/RegionMemberLifetimeBehavior.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/RegionMemberLifetimeBehavior.cs index 5fead2a529f43c299c585724a14af9a979fb13cf..3047a22e3ba22b9017ebe3d36cb495008c41376d 100644 --- a/src/Wpf/Prism.Wpf/Regions/Behaviors/RegionMemberLifetimeBehavior.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/RegionMemberLifetimeBehavior.cs @@ -1,5 +1,3 @@ - - using System; using System.Collections.Generic; using System.Linq; @@ -12,7 +10,7 @@ using Microsoft.UI.Xaml; using System.Windows; #endif -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// The RegionMemberLifetimeBehavior determines if items should be removed from the diff --git a/src/Wpf/Prism.Wpf/Regions/Behaviors/SelectorItemsSourceSyncBehavior.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/SelectorItemsSourceSyncBehavior.cs similarity index 99% rename from src/Wpf/Prism.Wpf/Regions/Behaviors/SelectorItemsSourceSyncBehavior.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/SelectorItemsSourceSyncBehavior.cs index 72ea6e59b9e33952b2d47f2c48c3076c6d110f22..9654e5bf685868075dc16a6abd5f47f141d9a837 100644 --- a/src/Wpf/Prism.Wpf/Regions/Behaviors/SelectorItemsSourceSyncBehavior.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/SelectorItemsSourceSyncBehavior.cs @@ -1,5 +1,3 @@ - - using System; using System.Collections.Generic; using System.Collections.Specialized; @@ -17,7 +15,7 @@ using System.Windows.Controls.Primitives; using System.Windows.Data; #endif -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Defines the attached behavior that keeps the items of the host control in synchronization with the . diff --git a/src/Wpf/Prism.Wpf/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs similarity index 98% rename from src/Wpf/Prism.Wpf/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs index da70aa8bcb379cc2a0af3b9d13bf0fc8e026ca14..e545d5cfa3a18805306760cf15e95d5a916ecbbb 100644 --- a/src/Wpf/Prism.Wpf/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/Behaviors/SyncRegionContextWithHostBehavior.cs @@ -1,5 +1,3 @@ - - using System; using Prism.Properties; using Prism.Common; @@ -10,7 +8,7 @@ using Microsoft.UI.Xaml; using System.Windows; #endif -namespace Prism.Regions.Behaviors +namespace Prism.Navigation.Regions.Behaviors { /// /// Behavior that synchronizes the property of a with diff --git a/src/Wpf/Prism.Wpf/Regions/ContentControlRegionAdapter.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/ContentControlRegionAdapter.cs similarity index 98% rename from src/Wpf/Prism.Wpf/Regions/ContentControlRegionAdapter.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/ContentControlRegionAdapter.cs index 4be4e8166ff7caa838bd759acb7c71c0ce76e573..02d928ad6e6ff5eb70185782695a8aeb2b6882aa 100644 --- a/src/Wpf/Prism.Wpf/Regions/ContentControlRegionAdapter.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/ContentControlRegionAdapter.cs @@ -1,5 +1,3 @@ - - using Prism.Properties; using System; using System.Collections.Specialized; @@ -14,7 +12,7 @@ using System.Windows.Controls; using System.Windows.Data; #endif -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Adapter that creates a new and monitors its diff --git a/src/Wpf/Prism.Wpf/Regions/DefaultRegionManagerAccessor.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/DefaultRegionManagerAccessor.cs similarity index 98% rename from src/Wpf/Prism.Wpf/Regions/DefaultRegionManagerAccessor.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/DefaultRegionManagerAccessor.cs index 79fa1fae0f9313a2cc51e6f0ad038301225934d8..cf08bff6212eae9f92c952d52079ec7186975b36 100644 --- a/src/Wpf/Prism.Wpf/Regions/DefaultRegionManagerAccessor.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/DefaultRegionManagerAccessor.cs @@ -6,7 +6,7 @@ using Microsoft.UI.Xaml; using System.Windows; #endif -namespace Prism.Regions +namespace Prism.Navigation.Regions { internal class DefaultRegionManagerAccessor : IRegionManagerAccessor { diff --git a/src/Wpf/Prism.Wpf/Regions/INavigationAware.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/INavigationAware.cs similarity index 90% rename from src/Wpf/Prism.Wpf/Regions/INavigationAware.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/INavigationAware.cs index 78046d63297c5416fdf5b6cce02c5fa81160320a..d43cc12808783807e24d2991e47eb4d99e444c1f 100644 --- a/src/Wpf/Prism.Wpf/Regions/INavigationAware.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/INavigationAware.cs @@ -1,6 +1,6 @@ #if !HAS_UNO_WINUI && !HAS_WINUI -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Provides a way for objects involved in navigation to be notified of navigation activities. diff --git a/src/Wpf/Prism.Wpf/Regions/IRegionManagerAccessor.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/IRegionManagerAccessor.cs similarity index 97% rename from src/Wpf/Prism.Wpf/Regions/IRegionManagerAccessor.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/IRegionManagerAccessor.cs index 3de10e41391941796f97f71c21b8edcf9a4cbacb..185e30bed23997fd7180815d691588141a615aae 100644 --- a/src/Wpf/Prism.Wpf/Regions/IRegionManagerAccessor.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/IRegionManagerAccessor.cs @@ -6,7 +6,7 @@ using Microsoft.UI.Xaml; using System.Windows; #endif -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Provides an abstraction on top of the RegionManager static members. diff --git a/src/Wpf/Prism.Wpf/Regions/ItemMetadata.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/ItemMetadata.cs similarity index 98% rename from src/Wpf/Prism.Wpf/Regions/ItemMetadata.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/ItemMetadata.cs index e204066b71884d83dd2f97b2eed5b02f162f0d80..721149db720367b5685b89d6930a77e2b7e898d6 100644 --- a/src/Wpf/Prism.Wpf/Regions/ItemMetadata.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/ItemMetadata.cs @@ -6,7 +6,7 @@ using Microsoft.UI.Xaml; using System.Windows; #endif -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Defines a class that wraps an item and adds metadata for it. diff --git a/src/Wpf/Prism.Wpf/Regions/ItemsControlRegionAdapter.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/ItemsControlRegionAdapter.cs similarity index 98% rename from src/Wpf/Prism.Wpf/Regions/ItemsControlRegionAdapter.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/ItemsControlRegionAdapter.cs index 5b10db0092a9911fd512e997499283c3c91a6a48..b7c08a32d8376832371eb371d172163d370943b8 100644 --- a/src/Wpf/Prism.Wpf/Regions/ItemsControlRegionAdapter.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/ItemsControlRegionAdapter.cs @@ -1,5 +1,3 @@ - - using Prism.Properties; using System; @@ -13,7 +11,7 @@ using System.Windows.Controls; using System.Windows.Data; #endif -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Adapter that creates a new and binds all diff --git a/src/Wpf/Prism.Wpf/Regions/Region.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/Region.cs similarity index 99% rename from src/Wpf/Prism.Wpf/Regions/Region.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/Region.cs index d033c219b090046144fc94d6d85affe83dcc8541..fea6bd0e6ae5a6df3ad6385f40d197ac5feb930d 100644 --- a/src/Wpf/Prism.Wpf/Regions/Region.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/Region.cs @@ -1,12 +1,10 @@ using System; using System.Collections.ObjectModel; -using System.ComponentModel; using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Linq; using Prism.Properties; using Prism.Ioc; -using Prism.Navigation; #if HAS_WINUI using Microsoft.UI.Xaml; @@ -18,7 +16,7 @@ using System.Windows.Controls; using System.Windows.Data; #endif -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Implementation of that allows multiple active views. diff --git a/src/Wpf/Prism.Wpf/Regions/RegionAdapterBase.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/RegionAdapterBase.cs similarity index 98% rename from src/Wpf/Prism.Wpf/Regions/RegionAdapterBase.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/RegionAdapterBase.cs index 38b484837c5df791b2b0f04bcec62d6b282dd1fb..588c6755dc27220b72ba9f8f049847eca822d094 100644 --- a/src/Wpf/Prism.Wpf/Regions/RegionAdapterBase.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/RegionAdapterBase.cs @@ -1,7 +1,5 @@ - - using Prism.Properties; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions.Behaviors; using System; using System.Globalization; @@ -12,7 +10,7 @@ using Microsoft.UI.Xaml.Data; using System.Windows; #endif -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Base class to facilitate the creation of implementations. diff --git a/src/Wpf/Prism.Wpf/Regions/RegionAdapterMappings.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/RegionAdapterMappings.cs similarity index 99% rename from src/Wpf/Prism.Wpf/Regions/RegionAdapterMappings.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/RegionAdapterMappings.cs index 42c3a9f7e70d4bb1b15a5dd1ad4c9482064a1369..d42f48fb2972cc451b39a72db5275afc6979e08b 100644 --- a/src/Wpf/Prism.Wpf/Regions/RegionAdapterMappings.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/RegionAdapterMappings.cs @@ -4,7 +4,7 @@ using System.Globalization; using Prism.Ioc; using Prism.Properties; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// This class maps with . diff --git a/src/Wpf/Prism.Wpf/Regions/RegionContext.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/RegionContext.cs similarity index 98% rename from src/Wpf/Prism.Wpf/Regions/RegionContext.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/RegionContext.cs index 1154d83a089b2cea6d8762b0c04073ddb362516d..48d61b405e805407bd3083d90b5d494d46dba736 100644 --- a/src/Wpf/Prism.Wpf/Regions/RegionContext.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/RegionContext.cs @@ -1,5 +1,3 @@ - - using Prism.Common; using System; @@ -9,7 +7,7 @@ using Microsoft.UI.Xaml; using System.Windows; #endif -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Class that holds methods to Set and Get the RegionContext from a DependencyObject. diff --git a/src/Wpf/Prism.Wpf/Regions/RegionManager.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/RegionManager.cs similarity index 99% rename from src/Wpf/Prism.Wpf/Regions/RegionManager.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/RegionManager.cs index 4345223f0cb0487afbf0e64b8165df655fbd1e2d..3b2e7b7b94bf2ef91a22685d0fdf3cd0b4048b14 100644 --- a/src/Wpf/Prism.Wpf/Regions/RegionManager.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/RegionManager.cs @@ -11,9 +11,8 @@ using Prism.Common; using Prism.Events; using Prism.Ioc; using Prism.Properties; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions.Behaviors; using Prism.Ioc.Internals; -using Prism.Navigation; #if HAS_WINUI using Microsoft.UI.Xaml; @@ -22,7 +21,7 @@ using System.Windows; #endif -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// This class is responsible for maintaining a collection of regions and attaching regions to controls. diff --git a/src/Wpf/Prism.Wpf/Regions/RegionNavigationContentLoader.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/RegionNavigationContentLoader.cs similarity index 99% rename from src/Wpf/Prism.Wpf/Regions/RegionNavigationContentLoader.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/RegionNavigationContentLoader.cs index bad6a6763f395d96c63533c3c2621e9630b01b9e..e01de9f7ba65feca0ab738debde2a54a8f3ca97c 100644 --- a/src/Wpf/Prism.Wpf/Regions/RegionNavigationContentLoader.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/RegionNavigationContentLoader.cs @@ -14,7 +14,7 @@ using System.Windows; #endif -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Implementation of that relies on a diff --git a/src/Wpf/Prism.Wpf/Regions/RegionNavigationService.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/RegionNavigationService.cs similarity index 99% rename from src/Wpf/Prism.Wpf/Regions/RegionNavigationService.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/RegionNavigationService.cs index da5b8b11cfba881dd1fc6637385c69e03c07dfd4..069cd710eb46afa415fd7201d0695d6662cd0269 100644 --- a/src/Wpf/Prism.Wpf/Regions/RegionNavigationService.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/RegionNavigationService.cs @@ -5,7 +5,6 @@ using System.Linq; using Prism.Common; using Prism.Properties; using Prism.Ioc; -using Prism.Navigation; #if HAS_WINUI using Microsoft.UI.Xaml; @@ -13,7 +12,7 @@ using Microsoft.UI.Xaml; using System.Windows; #endif -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Provides navigation for regions. diff --git a/src/Wpf/Prism.Wpf/Regions/RegionViewRegistry.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/RegionViewRegistry.cs similarity index 98% rename from src/Wpf/Prism.Wpf/Regions/RegionViewRegistry.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/RegionViewRegistry.cs index fd2c24d14b1958dadb9882c837ce33048385f2e1..0ead2d378af77b04332e3c4e4a144c83ab2f097a 100644 --- a/src/Wpf/Prism.Wpf/Regions/RegionViewRegistry.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/RegionViewRegistry.cs @@ -7,7 +7,7 @@ using Prism.Events; using Prism.Ioc; using Prism.Properties; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Defines a registry for the content of the regions used on View Discovery composition. @@ -64,7 +64,7 @@ namespace Prism.Regions } /// - /// Registers a delegate that can be used to retrieve the content associated with a region name. + /// Registers a delegate that can be used to retrieve the content associated with a region name. /// /// Region name to which the will be registered. /// Delegate used to retrieve the content associated with the . @@ -86,7 +86,7 @@ namespace Prism.Regions RegisterViewWithRegion(regionName, c => c.Resolve(targetName)); /// - /// Creates an instance of a registered view . + /// Creates an instance of a registered view . /// /// Type of the registered view. /// Instance of the registered view. diff --git a/src/Wpf/Prism.Wpf/Regions/SelectorRegionAdapter.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/SelectorRegionAdapter.cs similarity index 97% rename from src/Wpf/Prism.Wpf/Regions/SelectorRegionAdapter.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/SelectorRegionAdapter.cs index 3c545b3c15842a2a6cbd592ab6106d1fcb9e141d..9aa545cccfedc9166112fa32e0cd0104fb924b8b 100644 --- a/src/Wpf/Prism.Wpf/Regions/SelectorRegionAdapter.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/SelectorRegionAdapter.cs @@ -1,4 +1,4 @@ -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions.Behaviors; using System; #if HAS_WINUI @@ -7,7 +7,7 @@ using Microsoft.UI.Xaml.Controls.Primitives; using System.Windows.Controls.Primitives; #endif -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Adapter that creates a new and binds all diff --git a/src/Wpf/Prism.Wpf/Regions/SingleActiveRegion.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/SingleActiveRegion.cs similarity index 96% rename from src/Wpf/Prism.Wpf/Regions/SingleActiveRegion.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/SingleActiveRegion.cs index 36931035968ae35717efe1417bafbab9ab020aa1..e6aebe228f2e0e10488cd309c26f5926c42517ea 100644 --- a/src/Wpf/Prism.Wpf/Regions/SingleActiveRegion.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/SingleActiveRegion.cs @@ -1,6 +1,6 @@ using System.Linq; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Region that allows a maximum of one active view at a time. diff --git a/src/Wpf/Prism.Wpf/Regions/ViewsCollection.cs b/src/Wpf/Prism.Wpf/Navigation/Regions/ViewsCollection.cs similarity index 99% rename from src/Wpf/Prism.Wpf/Regions/ViewsCollection.cs rename to src/Wpf/Prism.Wpf/Navigation/Regions/ViewsCollection.cs index b7d06f5b1cbe9d76892646ab5a5ee088899a8b53..2d5640fd43bda0912e3e4232ee2729d5b581030b 100644 --- a/src/Wpf/Prism.Wpf/Regions/ViewsCollection.cs +++ b/src/Wpf/Prism.Wpf/Navigation/Regions/ViewsCollection.cs @@ -5,7 +5,7 @@ using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; -namespace Prism.Regions +namespace Prism.Navigation.Regions { /// /// Implementation of that takes an of @@ -226,7 +226,7 @@ namespace Prism.Regions } // If we're sorting we can't predict how - // the collection has changed on an add so we + // the collection has changed on an add so we // resort to a reset notification. if (this.sort != null) { diff --git a/src/Wpf/Prism.Wpf/PrismApplicationBase.cs b/src/Wpf/Prism.Wpf/PrismApplicationBase.cs index 408a71cee8f0d99fa30da41a4c95aaf90c7becba..3ccd861f9e03ad53c0664994c9d52e1854b6e48e 100644 --- a/src/Wpf/Prism.Wpf/PrismApplicationBase.cs +++ b/src/Wpf/Prism.Wpf/PrismApplicationBase.cs @@ -3,7 +3,7 @@ using System.Windows; using Prism.Common; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism { @@ -117,8 +117,8 @@ namespace Prism protected abstract void RegisterTypes(IContainerRegistry containerRegistry); /// - /// Configures the . - /// This will be the list of default behaviors that will be added to a region. + /// Configures the . + /// This will be the list of default behaviors that will be added to a region. /// protected virtual void ConfigureDefaultRegionBehaviors(IRegionBehaviorFactory regionBehaviors) { @@ -137,7 +137,7 @@ namespace Prism } /// - /// Registers the s of the Exceptions that are not considered + /// Registers the s of the Exceptions that are not considered /// root exceptions by the . /// protected virtual void RegisterFrameworkExceptionTypes() diff --git a/src/Wpf/Prism.Wpf/PrismBootstrapperBase.cs b/src/Wpf/Prism.Wpf/PrismBootstrapperBase.cs index c1b4e0591771f915178a5e72a35192c7e2ba5d54..9a74a34ee910ac697a7667fe63193c2e0b8b7131 100644 --- a/src/Wpf/Prism.Wpf/PrismBootstrapperBase.cs +++ b/src/Wpf/Prism.Wpf/PrismBootstrapperBase.cs @@ -3,7 +3,7 @@ using System.Windows; using Prism.Common; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism { @@ -117,8 +117,8 @@ namespace Prism protected abstract void RegisterTypes(IContainerRegistry containerRegistry); /// - /// Configures the . - /// This will be the list of default behaviors that will be added to a region. + /// Configures the . + /// This will be the list of default behaviors that will be added to a region. /// protected virtual void ConfigureDefaultRegionBehaviors(IRegionBehaviorFactory regionBehaviors) { @@ -137,7 +137,7 @@ namespace Prism } /// - /// Registers the s of the Exceptions that are not considered + /// Registers the s of the Exceptions that are not considered /// root exceptions by the . /// protected virtual void RegisterFrameworkExceptionTypes() diff --git a/src/Wpf/Prism.Wpf/PrismInitializationExtensions.cs b/src/Wpf/Prism.Wpf/PrismInitializationExtensions.cs index 1356006ab85d8f1d2345885f6fd32707f9a7eea8..284ec129e349bb8bd46a2b224b7a528027187c33 100644 --- a/src/Wpf/Prism.Wpf/PrismInitializationExtensions.cs +++ b/src/Wpf/Prism.Wpf/PrismInitializationExtensions.cs @@ -2,8 +2,8 @@ using Prism.Ioc; using Prism.Modularity; using Prism.Mvvm; -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; using Prism.Dialogs; #if HAS_WINUI diff --git a/src/Wpf/Prism.Wpf/Properties/AssemblyInfo.cs b/src/Wpf/Prism.Wpf/Properties/AssemblyInfo.cs index a3bb05f44674d3f6ff8d2c5bbb8997b0be82f39e..935f20c32d5d3946964b36040575225a060bc477 100644 --- a/src/Wpf/Prism.Wpf/Properties/AssemblyInfo.cs +++ b/src/Wpf/Prism.Wpf/Properties/AssemblyInfo.cs @@ -1,9 +1,5 @@ using System; -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Windows; using System.Windows.Markup; [assembly: ComVisible(false)] @@ -11,14 +7,14 @@ using System.Windows.Markup; [assembly: CLSCompliant(true)] // ----- Legacy ----- -[assembly: XmlnsDefinition("http://www.codeplex.com/prism", "Prism.Regions")] -[assembly: XmlnsDefinition("http://www.codeplex.com/prism", "Prism.Regions.Behaviors")] +[assembly: XmlnsDefinition("http://www.codeplex.com/prism", "Prism.Navigation.Regions")] +[assembly: XmlnsDefinition("http://www.codeplex.com/prism", "Prism.Navigation.Regions.Behaviors")] [assembly: XmlnsDefinition("http://www.codeplex.com/prism", "Prism.Mvvm")] [assembly: XmlnsDefinition("http://www.codeplex.com/prism", "Prism.Interactivity")] // ----- Legacy ----- -[assembly: XmlnsDefinition("http://prismlibrary.com/", "Prism.Regions")] -[assembly: XmlnsDefinition("http://prismlibrary.com/", "Prism.Regions.Behaviors")] +[assembly: XmlnsDefinition("http://prismlibrary.com/", "Prism.Navigation.Regions")] +[assembly: XmlnsDefinition("http://prismlibrary.com/", "Prism.Navigation.Regions.Behaviors")] [assembly: XmlnsDefinition("http://prismlibrary.com/", "Prism.Mvvm")] [assembly: XmlnsDefinition("http://prismlibrary.com/", "Prism.Interactivity")] [assembly: XmlnsDefinition("http://prismlibrary.com/", "Prism.Dialogs")] diff --git a/tests/Forms/Prism.DI.Forms.Tests/Mocks/ViewModels/Issue2415PageViewModel.cs b/tests/Forms/Prism.DI.Forms.Tests/Mocks/ViewModels/Issue2415PageViewModel.cs index 8bd37abb2a079af3b6981e0c4f867692b78f88ea..d1c95eab645ef2cac1464ce2b552e8bbd3776069 100644 --- a/tests/Forms/Prism.DI.Forms.Tests/Mocks/ViewModels/Issue2415PageViewModel.cs +++ b/tests/Forms/Prism.DI.Forms.Tests/Mocks/ViewModels/Issue2415PageViewModel.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Text; using Prism.Mvvm; using Prism.Navigation; -using Prism.Regions; -using Prism.Regions.Navigation; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Navigation; using Xamarin.Forms; namespace Prism.DI.Forms.Tests.Mocks.ViewModels diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockPresentationRegion.cs b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockPresentationRegion.cs index f325b0b6f3c196e4d1608b83fb65f4ba07073608..6c258f4692445cd108be3e622a1e3c2dd6697533 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockPresentationRegion.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockPresentationRegion.cs @@ -1,9 +1,9 @@ using System; using System.ComponentModel; using Prism.Navigation; -using Prism.Regions; -using Prism.Regions.Behaviors; -using Prism.Regions.Navigation; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; +using Prism.Navigation.Regions.Navigation; using Xamarin.Forms; namespace Prism.Forms.Regions.Mocks diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegion.cs b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegion.cs index f59d205eb3a21834d93512582f6fae9a29ddbed0..4efa729aea9e58b7987b7d2f41cb51ad29e968b0 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegion.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegion.cs @@ -1,9 +1,9 @@ using System; using System.ComponentModel; using Prism.Navigation; -using Prism.Regions; -using Prism.Regions.Behaviors; -using Prism.Regions.Navigation; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; +using Prism.Navigation.Regions.Navigation; using Xamarin.Forms; namespace Prism.Forms.Regions.Mocks diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionAdapter.cs b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionAdapter.cs index bb9cc19e503542d1069c0e133d385d8027a032ff..740d7da8d05f2b074b2454023046733350a228db 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionAdapter.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionAdapter.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Prism.Regions; -using Prism.Regions.Adapters; +using Prism.Navigation.Regions; using Xamarin.Forms; +using RegionManager = Prism.Navigation.Regions.Xaml.RegionManager; namespace Prism.Forms.Regions.Mocks { @@ -17,7 +17,7 @@ namespace Prism.Forms.Regions.Mocks var region = new MockPresentationRegion(); if (regionTarget is VisualElement element) - Prism.Regions.Xaml.RegionManager.GetObservableRegion(element).Value = region; + RegionManager.GetObservableRegion(element).Value = region; // Fire update regions again. This also happens if a region is created and added to the RegionManager if (Accessor != null) diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionBehavior.cs b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionBehavior.cs index af79884abec0f7be2adec72e93325fc9efaeea78..a0cb186a01b90cac88f29624491a2c6fa255656a 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionBehavior.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionBehavior.cs @@ -1,6 +1,6 @@ using System; -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; namespace Prism.Forms.Regions.Mocks { diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionBehaviorCollection.cs b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionBehaviorCollection.cs index 15b1c88a258497784c13620bf5d898c44823ef39..bfdaf6cfb02a99f3f4fb8dc9b99ed74a2b80cc64 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionBehaviorCollection.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionBehaviorCollection.cs @@ -1,6 +1,6 @@ using System.Collections; using System.Collections.Generic; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism.Forms.Regions.Mocks { diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionManagerAccessor.cs b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionManagerAccessor.cs index 1187aed7352fa55dd44236ae045a925477566612..1ae145229c5e2581ef765c6ced8491ce1dea22b4 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionManagerAccessor.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockRegionManagerAccessor.cs @@ -1,5 +1,6 @@ using System; -using Prism.Regions; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions; using Xamarin.Forms; namespace Prism.Forms.Regions.Mocks diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockSortableView1.cs b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockSortableView1.cs index 8d7aa3e4602a0f24c5e11f73d29807a87f249ed0..c4f7cef662b4ea12633bb8c7df35747e58106791 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockSortableView1.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockSortableView1.cs @@ -1,4 +1,4 @@ -using Prism.Regions; +using Prism.Navigation.Regions; using Xamarin.Forms; namespace Prism.Forms.Regions.Mocks diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockSortableView2.cs b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockSortableView2.cs index da2a187a6272d94a142f162619f6438d59ae5458..95d63ddc974610ad6492228a16bd38ed1aebcfb3 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockSortableView2.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockSortableView2.cs @@ -1,4 +1,4 @@ -using Prism.Regions; +using Prism.Navigation.Regions; using Xamarin.Forms; namespace Prism.Forms.Regions.Mocks diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockSortableView3.cs b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockSortableView3.cs index d17980b655221964081ff33018a34978423f8a80..1fbd472214b16d0284fd6a303289c93fdd083e80 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockSortableView3.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockSortableView3.cs @@ -1,4 +1,4 @@ -using Prism.Regions; +using Prism.Navigation.Regions; using Xamarin.Forms; namespace Prism.Forms.Regions.Mocks diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockViewsCollection.cs b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockViewsCollection.cs index cb44f68569dcf7984214f81ea04d0e0bda292aed..d890e5fdc96a8ff7e95d53e5ea8616ef7900866a 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockViewsCollection.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Mocks/MockViewsCollection.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Collections.Specialized; -using Prism.Regions; +using Prism.Navigation.Regions; using Xamarin.Forms; namespace Prism.Forms.Regions.Mocks diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/AllActiveRegionFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/AllActiveRegionFixture.cs index 33196554d784d95c748a58fa229265574221e1a3..6e224945450f52f0992ca959a12e6bec772b7282 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/AllActiveRegionFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/AllActiveRegionFixture.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Text; -using Prism.Regions; +using Prism.Navigation.Regions; using Xamarin.Forms; using Xunit; diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/ContentViewRegionAdapterFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/ContentViewRegionAdapterFixture.cs index 9e47f358fcb6a2399e1b3a7fa7399379271f87cd..eef3b6d59cd7027e2abb477441cfeda7cb149738 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/ContentViewRegionAdapterFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/ContentViewRegionAdapterFixture.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Text; using Prism.Forms.Regions.Mocks; -using Prism.Regions; -using Prism.Regions.Adapters; +using Prism.Navigation.Regions.Adapters; +using Prism.Navigation.Regions; using Xamarin.Forms; using Xunit; diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/LocatorNavigationTargetHandlerFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/LocatorNavigationTargetHandlerFixture.cs index a83b9808db8336ff4e8dfc193cc82e7640a6621d..460251d50f6e9c2bd9223dba2d802de4ce876e3f 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/LocatorNavigationTargetHandlerFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/LocatorNavigationTargetHandlerFixture.cs @@ -4,11 +4,12 @@ using System.Text; using Moq; using Prism.Ioc; using Prism.Ioc.Internals; -using Prism.Regions; -using Prism.Regions.Navigation; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Navigation; +using Prism.Navigation.Regions; using Xamarin.Forms; using Xunit; -using Region = Prism.Regions.Region; +using Region = Prism.Navigation.Regions.Region; namespace Prism.Forms.Regions.Tests { diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/NavigationAsyncExtensionsFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/NavigationAsyncExtensionsFixture.cs index ef24662954d2795261bf27c0e1229bafa5da8282..fe4e8eb51d382c7392b145a1690e850cbd0771cd 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/NavigationAsyncExtensionsFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/NavigationAsyncExtensionsFixture.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using Moq; using Prism.Navigation; -using Prism.Regions; +using Prism.Navigation.Regions; using Xunit; namespace Prism.Forms.Regions.Tests diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/NavigationContextFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/NavigationContextFixture.cs index 9553ea02738c21116e87ee8d2e6a78c4d3250360..75618cccb61390f39494242afd6a65e410849ff9 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/NavigationContextFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/NavigationContextFixture.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Text; using Moq; -using Prism.Regions; -using Prism.Regions.Navigation; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Navigation; using Xunit; namespace Prism.Forms.Regions.Tests diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionAdapterBaseFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionAdapterBaseFixture.cs index 405d6b3efbf7bc7a311277f8f364202632d670ce..bfda2cbef871661703e4702c3f02ede41d54620b 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionAdapterBaseFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionAdapterBaseFixture.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Text; using Prism.Forms.Regions.Mocks; -using Prism.Regions; -using Prism.Regions.Adapters; +using Prism.Navigation.Regions.Adapters; +using Prism.Navigation.Regions; using Xamarin.Forms; using Xunit; diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionAdapterMappingFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionAdapterMappingFixture.cs index 44407a6972261db72ac0b2b330a501c28d72f7d1..03b998bb4d6b4fc2ca21cfccabc40aa5840fbdcf 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionAdapterMappingFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionAdapterMappingFixture.cs @@ -4,7 +4,7 @@ using System.Text; using Moq; using Prism.Forms.Regions.Mocks; using Prism.Ioc; -using Prism.Regions.Adapters; +using Prism.Navigation.Regions.Adapters; using Xunit; namespace Prism.Forms.Regions.Tests diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionBehaviorCollectionFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionBehaviorCollectionFixture.cs index 4823622caefdef49b0c7446e479e5aafa49f0d51..a87ee94f1e739956efa2091ccc647bf75f38fb97 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionBehaviorCollectionFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionBehaviorCollectionFixture.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; using Prism.Forms.Regions.Mocks; -using Prism.Regions; +using Prism.Navigation.Regions; using Xunit; namespace Prism.Forms.Regions.Tests diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionBehaviorFactoryFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionBehaviorFactoryFixture.cs index d5ac28bb02446daa690100f2675b5c263dd7b509..eea42ff125ac516ce0739f84a4865b13c330fa68 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionBehaviorFactoryFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionBehaviorFactoryFixture.cs @@ -4,7 +4,7 @@ using System.Linq; using Moq; using Prism.Forms.Regions.Mocks; using Prism.Ioc; -using Prism.Regions; +using Prism.Navigation.Regions; using Xunit; namespace Prism.Forms.Regions.Tests diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionBehaviorFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionBehaviorFixture.cs index 1dad26097cab659575eb9caa03e232bf6c949d9a..b4481d72a8de064a25bd4478442cf0eebcf07804 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionBehaviorFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionBehaviorFixture.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Text; using Prism.Forms.Regions.Mocks; -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; using Xunit; namespace Prism.Forms.Regions.Tests diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionFixture.cs index e67c294150bcc419dd123f7a2f7d7cf04fe82832..166e490a9ef4294b5d9834aa53bb5674477f661d 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionFixture.cs @@ -1,16 +1,14 @@ using System; -using System.Collections.Generic; using System.Collections.Specialized; using System.Linq; -using System.Text; using Moq; using Prism.Ioc; using Prism.Navigation; -using Prism.Regions; -using Prism.Regions.Navigation; +using Prism.Navigation.Regions; using Xamarin.Forms; using Xunit; -using Region = Prism.Regions.Region; +using Region = Prism.Navigation.Regions.Region; +using RegionManager = Prism.Navigation.Regions.Xaml.RegionManager; namespace Prism.Forms.Regions.Tests { @@ -174,7 +172,7 @@ namespace Prism.Forms.Regions.Tests region.Add(myView); - Assert.Same(regionManager, myView.GetValue(Prism.Regions.Xaml.RegionManager.RegionManagerProperty)); + Assert.Same(regionManager, myView.GetValue(RegionManager.RegionManagerProperty)); } [Fact] @@ -189,7 +187,7 @@ namespace Prism.Forms.Regions.Tests region.Add(myView, "MyView"); - Assert.Same(regionManager, myView.GetValue(Prism.Regions.Xaml.RegionManager.RegionManagerProperty)); + Assert.Same(regionManager, myView.GetValue(RegionManager.RegionManagerProperty)); } [Fact] @@ -204,7 +202,7 @@ namespace Prism.Forms.Regions.Tests region.Add(myView, "MyView", true); - Assert.NotSame(regionManager, myView.GetValue(Prism.Regions.Xaml.RegionManager.RegionManagerProperty)); + Assert.NotSame(regionManager, myView.GetValue(RegionManager.RegionManagerProperty)); } [Fact] @@ -542,7 +540,7 @@ namespace Prism.Forms.Regions.Tests region.Remove(view); - view.ClearValue(Prism.Regions.Xaml.RegionManager.RegionManagerProperty); + view.ClearValue(RegionManager.RegionManagerProperty); Assert.Empty(region.Views); @@ -550,7 +548,7 @@ namespace Prism.Forms.Regions.Tests Assert.Equal(view, region.Views.First()); - Assert.Same(newScopedRegion, view.GetValue(Prism.Regions.Xaml.RegionManager.RegionManagerProperty)); + Assert.Same(newScopedRegion, view.GetValue(RegionManager.RegionManagerProperty)); } [ViewSortHint("C")] diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionManagerFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionManagerFixture.cs index 70095001c871cddec61d027869a9bebeed8b5fb5..692f839673cb1b31e14c81888634b3b39aa17e59 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionManagerFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionManagerFixture.cs @@ -1,15 +1,14 @@ using System; using System.Collections.Generic; using System.Collections.Specialized; -using System.Text; using System.Threading.Tasks; using Moq; using Prism.Forms.Regions.Mocks; using Prism.Ioc; -using Prism.Regions; +using Prism.Navigation.Regions; using Xamarin.Forms; using Xunit; -using Region = Prism.Regions.Region; +using Region = Prism.Navigation.Regions.Region; namespace Prism.Forms.Regions.Tests { @@ -129,7 +128,7 @@ namespace Prism.Forms.Regions.Tests try { - Prism.Regions.Xaml.RegionManager.UpdatingRegions += listener.OnUpdatingRegions; + Navigation.Regions.Xaml.RegionManager.UpdatingRegions += listener.OnUpdatingRegions; var regionManager = new RegionManager(); regionManager.Regions.ContainsRegionWithName("TestRegion"); Assert.True(listener.OnUpdatingRegionsCalled); @@ -152,7 +151,7 @@ namespace Prism.Forms.Regions.Tests } finally { - Prism.Regions.Xaml.RegionManager.UpdatingRegions -= listener.OnUpdatingRegions; + Navigation.Regions.Xaml.RegionManager.UpdatingRegions -= listener.OnUpdatingRegions; } } @@ -168,7 +167,7 @@ namespace Prism.Forms.Regions.Tests observableObject.PropertyChanged += (sender, args) => propertyChangedCalled = true; Assert.Null(observableObject.Value); - Prism.Regions.Xaml.RegionManager.SetRegionContext(view, "MyContext"); + Navigation.Regions.Xaml.RegionManager.SetRegionContext(view, "MyContext"); Assert.True(propertyChangedCalled); Assert.Equal("MyContext", observableObject.Value); } @@ -177,8 +176,8 @@ namespace Prism.Forms.Regions.Tests public async Task ShouldNotPreventSubscribersToStaticEventFromBeingGarbageCollected() { var subscriber = new MySubscriberClass(); - Prism.Regions.Xaml.RegionManager.UpdatingRegions += subscriber.OnUpdatingRegions; - Prism.Regions.Xaml.RegionManager.UpdateRegions(); + Navigation.Regions.Xaml.RegionManager.UpdatingRegions += subscriber.OnUpdatingRegions; + Navigation.Regions.Xaml.RegionManager.UpdateRegions(); Assert.True(subscriber.OnUpdatingRegionsCalled); var subscriberWeakReference = new WeakReference(subscriber); @@ -195,11 +194,11 @@ namespace Prism.Forms.Regions.Tests try { ExceptionExtensions.RegisterFrameworkExceptionType(typeof(FrameworkException)); - Prism.Regions.Xaml.RegionManager.UpdatingRegions += new EventHandler(RegionManager_UpdatingRegions); + Navigation.Regions.Xaml.RegionManager.UpdatingRegions += new EventHandler(RegionManager_UpdatingRegions); try { - Prism.Regions.Xaml.RegionManager.UpdateRegions(); + Navigation.Regions.Xaml.RegionManager.UpdateRegions(); //Assert.Fail(); } catch (Exception ex) @@ -209,7 +208,7 @@ namespace Prism.Forms.Regions.Tests } finally { - Prism.Regions.Xaml.RegionManager.UpdatingRegions -= new EventHandler(RegionManager_UpdatingRegions); + Navigation.Regions.Xaml.RegionManager.UpdatingRegions -= new EventHandler(RegionManager_UpdatingRegions); } } diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionManagerRequestNavigateFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionManagerRequestNavigateFixture.cs index 60560df0045249c6ead0a660df7594f57c520ad2..0f49b7cf1829464538778f8591faf6903239c637 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionManagerRequestNavigateFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionManagerRequestNavigateFixture.cs @@ -3,8 +3,9 @@ using System.Collections.Generic; using System.Text; using Moq; using Prism.Navigation; -using Prism.Regions; -using Prism.Regions.Navigation; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Navigation; using Xunit; namespace Prism.Forms.Regions.Tests diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionNavigationJournalFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionNavigationJournalFixture.cs index a444489dd79cfaf134da9b3b5b825594aedcd458..08d5a93b767f46da405ad2d9fdf5c7c3478577b2 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionNavigationJournalFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionNavigationJournalFixture.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Text; using Moq; using Prism.Navigation; -using Prism.Regions; -using Prism.Regions.Navigation; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Navigation; using Xunit; namespace Prism.Forms.Regions.Tests diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionNavigationServiceFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionNavigationServiceFixture.cs index afdcaea510b84ebf4d966c712e6130dc63364596..476c5cf418314d100956e1fb27a0165aa799e98c 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionNavigationServiceFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionNavigationServiceFixture.cs @@ -1,14 +1,15 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using Moq; using Prism.Ioc; using Prism.Navigation; -using Prism.Regions; -using Prism.Regions.Navigation; +using Prism.Navigation.Regions.Navigation; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Navigation; using Xamarin.Forms; using Xunit; -using Region = Prism.Regions.Region; +using Region = Prism.Navigation.Regions.Region; namespace Prism.Forms.Regions.Tests { diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionViewRegistryFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionViewRegistryFixture.cs index 29042e43b8cc852bf1b66943a787e013f9ad7d2f..694a97f80bf48c06b9a19bf31fa69f5e9797f412 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionViewRegistryFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/RegionViewRegistryFixture.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using Moq; using Prism.Ioc; -using Prism.Regions; +using Prism.Navigation.Regions; using Xamarin.Forms; using Xunit; diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/SingleActiveRegionFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/SingleActiveRegionFixture.cs index e0fd70c57a97384743ceb4cf0fa0407f69b11f60..19ecd110214ba95549a39cec091da3988740ddd2 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/SingleActiveRegionFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/SingleActiveRegionFixture.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Text; -using Prism.Regions; +using Prism.Navigation.Regions; using Xamarin.Forms; using Xunit; diff --git a/tests/Forms/Prism.Forms.Regions.Tests/Tests/ViewsCollectionFixture.cs b/tests/Forms/Prism.Forms.Regions.Tests/Tests/ViewsCollectionFixture.cs index 2db5a8a4c84348d64ddd820b7fbe02ff9e707e1e..298aaf8520ba200bcf4b90c9744c9c28295cd3f2 100644 --- a/tests/Forms/Prism.Forms.Regions.Tests/Tests/ViewsCollectionFixture.cs +++ b/tests/Forms/Prism.Forms.Regions.Tests/Tests/ViewsCollectionFixture.cs @@ -5,10 +5,11 @@ using System.Collections.Specialized; using System.Linq; using System.Text; using Prism.Forms.Regions.Mocks; -using Prism.Regions; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions; using Xamarin.Forms; using Xunit; -using Region = Prism.Regions.Region; +using Region = Prism.Navigation.Regions.Region; namespace Prism.Forms.Regions.Tests { diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockContentRegionPage.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockContentRegionPage.cs index 1252d0090db6ab5208c529b3ba859afca6b9d441..5d4b495d785cb5746392d385cc93762d7c561296 100644 --- a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockContentRegionPage.cs +++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockContentRegionPage.cs @@ -5,10 +5,10 @@ public class MockContentRegionPage : ContentPage public MockContentRegionPage() { ContentRegion = new ContentView(); - ContentRegion.SetValue(Prism.Regions.Xaml.RegionManager.RegionNameProperty, nameof(ContentRegion)); + ContentRegion.SetValue(Prism.Navigation.Regions.Xaml.RegionManager.RegionNameProperty, nameof(ContentRegion)); FrameRegion = new Frame(); - FrameRegion.SetValue(Prism.Regions.Xaml.RegionManager.RegionNameProperty, nameof(FrameRegion)); + FrameRegion.SetValue(Prism.Navigation.Regions.Xaml.RegionManager.RegionNameProperty, nameof(FrameRegion)); Content = new StackLayout { diff --git a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockPageWithRegionAndDefaultView.cs b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockPageWithRegionAndDefaultView.cs index 52873c633f288d3d91b1b490c2036c9d777bd62f..5b97c59138ee165951663440f8f566df1d6f19da 100644 --- a/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockPageWithRegionAndDefaultView.cs +++ b/tests/Maui/Prism.DryIoc.Maui.Tests/Mocks/Views/MockPageWithRegionAndDefaultView.cs @@ -5,8 +5,8 @@ public class MockPageWithRegionAndDefaultView : ContentPage public MockPageWithRegionAndDefaultView() { var view = new ContentView(); - view.SetValue(Prism.Regions.Xaml.RegionManager.RegionNameProperty, "Demo"); - view.SetValue(Prism.Regions.Xaml.RegionManager.DefaultViewProperty, "MockRegionViewA"); + view.SetValue(Prism.Navigation.Regions.Xaml.RegionManager.RegionNameProperty, "Demo"); + view.SetValue(Prism.Navigation.Regions.Xaml.RegionManager.DefaultViewProperty, "MockRegionViewA"); Content = view; } } diff --git a/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Bootstrapper/BootstrapperFixture.cs b/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Bootstrapper/BootstrapperFixture.cs index 2cc21680b24960903851b8f2affc0f39e543abc4..c034884796ed4c0fcaf47d4d1acb6517c5e89976 100644 --- a/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Bootstrapper/BootstrapperFixture.cs +++ b/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Bootstrapper/BootstrapperFixture.cs @@ -2,7 +2,7 @@ using Prism.Container.Wpf.Mocks; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; using Xunit; using static Prism.Container.Wpf.Tests.ContainerHelper; diff --git a/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Bootstrapper/BootstrapperRunMethodFixture.cs b/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Bootstrapper/BootstrapperRunMethodFixture.cs index 60d4b7faa99ccb26c6306c0e236f464f74bab681..746de5da378ca1ef529fea34644f0e81ba610439 100644 --- a/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Bootstrapper/BootstrapperRunMethodFixture.cs +++ b/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Bootstrapper/BootstrapperRunMethodFixture.cs @@ -3,7 +3,7 @@ using Prism.Container.Wpf.Mocks; using Prism.Events; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; using Xunit; namespace Prism.Container.Wpf.Tests.Bootstrapper diff --git a/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Regions/RegionNavigationContentLoaderFixture.cs b/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Regions/RegionNavigationContentLoaderFixture.cs index f749bc861c10b8eb9316f8af7db744b302ae908b..c73f875ed8075bfdd7c271171e3d955d8c30b427 100644 --- a/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Regions/RegionNavigationContentLoaderFixture.cs +++ b/tests/Wpf/Prism.Container.Wpf.Shared/Fixtures/Regions/RegionNavigationContentLoaderFixture.cs @@ -1,7 +1,7 @@ using System.Linq; using Prism.Ioc; using Prism.IocContainer.Wpf.Tests.Support.Mocks.Views; -using Prism.Regions; +using Prism.Navigation.Regions; using Xunit; using static Prism.Container.Wpf.Tests.ContainerHelper; diff --git a/tests/Wpf/Prism.DryIoc.Wpf.Tests/Fixtures/BootstrapperRunMethodFixture.cs b/tests/Wpf/Prism.DryIoc.Wpf.Tests/Fixtures/BootstrapperRunMethodFixture.cs index 56a0e37a205653b533c92dbcbe6e216436183b94..87b88c73e237c867b4782173e5539c4b56241931 100644 --- a/tests/Wpf/Prism.DryIoc.Wpf.Tests/Fixtures/BootstrapperRunMethodFixture.cs +++ b/tests/Wpf/Prism.DryIoc.Wpf.Tests/Fixtures/BootstrapperRunMethodFixture.cs @@ -6,7 +6,7 @@ using Prism.DryIoc; using Prism.Events; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; using Xunit; namespace Prism.Container.Wpf.Tests.Bootstrapper diff --git a/tests/Wpf/Prism.DryIoc.Wpf.Tests/Mocks/MockBootstrapper.cs b/tests/Wpf/Prism.DryIoc.Wpf.Tests/Mocks/MockBootstrapper.cs index d2defd122e74afabae77bafccf19f71ccdef5d56..6ee2c090f0e039c81f482f6de49aac5ff74bfc5d 100644 --- a/tests/Wpf/Prism.DryIoc.Wpf.Tests/Mocks/MockBootstrapper.cs +++ b/tests/Wpf/Prism.DryIoc.Wpf.Tests/Mocks/MockBootstrapper.cs @@ -6,7 +6,7 @@ using DryIoc; using Prism.DryIoc; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism.Container.Wpf.Mocks { diff --git a/tests/Wpf/Prism.IocContainer.Wpf.Tests.Support/Mocks/MockRegionManager.cs b/tests/Wpf/Prism.IocContainer.Wpf.Tests.Support/Mocks/MockRegionManager.cs index b31f8cf7b2e9ba8529298ecb064854a765675546..dea47e0e358b1acb26371880f273e220ee6c0a56 100644 --- a/tests/Wpf/Prism.IocContainer.Wpf.Tests.Support/Mocks/MockRegionManager.cs +++ b/tests/Wpf/Prism.IocContainer.Wpf.Tests.Support/Mocks/MockRegionManager.cs @@ -1,7 +1,7 @@ using System; using Prism.Ioc; using Prism.Navigation; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism.IocContainer.Wpf.Tests.Support.Mocks { diff --git a/tests/Wpf/Prism.Unity.Wpf.Tests/Fixtures/BootstrapperRunMethodFixture.cs b/tests/Wpf/Prism.Unity.Wpf.Tests/Fixtures/BootstrapperRunMethodFixture.cs index b3529af97aede823d0bd08128ef20ff3074c66ec..537318ea297a57af5f42b99cf7ab32243909743f 100644 --- a/tests/Wpf/Prism.Unity.Wpf.Tests/Fixtures/BootstrapperRunMethodFixture.cs +++ b/tests/Wpf/Prism.Unity.Wpf.Tests/Fixtures/BootstrapperRunMethodFixture.cs @@ -4,7 +4,7 @@ using Prism.Container.Wpf.Mocks; using Prism.Events; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; using Prism.Unity; using Unity; using Unity.Lifetime; diff --git a/tests/Wpf/Prism.Unity.Wpf.Tests/Mocks/MockBootstrapper.cs b/tests/Wpf/Prism.Unity.Wpf.Tests/Mocks/MockBootstrapper.cs index 6d9ce72ffbca2829937fef3fb1696955a7e20778..001dc456bbd7c047a98019ce793b480bfa531149 100644 --- a/tests/Wpf/Prism.Unity.Wpf.Tests/Mocks/MockBootstrapper.cs +++ b/tests/Wpf/Prism.Unity.Wpf.Tests/Mocks/MockBootstrapper.cs @@ -4,7 +4,7 @@ using System.Windows; using System.Windows.Controls; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; +using Prism.Navigation.Regions; using Prism.Unity; using Unity; diff --git a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockHostAwareRegionBehavior.cs b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockHostAwareRegionBehavior.cs index df34c36d2fd91ce3d7f502857ed2b6568e445be4..dc25f392e1100a431f81779317de355d942d378a 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockHostAwareRegionBehavior.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockHostAwareRegionBehavior.cs @@ -1,8 +1,8 @@ using System.Windows; -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; namespace Prism.Wpf.Tests.Mocks { diff --git a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockPresentationRegion.cs b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockPresentationRegion.cs index ab63a17d33b22b9eae0e5e8c16b1834536adf741..3e45d34e2bee53235e12f49343452aea10fa75f6 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockPresentationRegion.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockPresentationRegion.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel; using Prism.Navigation; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism.Wpf.Tests.Mocks { diff --git a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegion.cs b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegion.cs index c6aac83c1a8001b7da71236d45a6371a9de4aee9..585b6b43038beb5eb32e3c0975e65a497811003c 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegion.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegion.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel; using Prism.Navigation; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism.Wpf.Tests.Mocks { diff --git a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionAdapter.cs b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionAdapter.cs index 15bb6498be45295ff3ff30f3246d1d5f9a4ab9b4..f039fd79b6c1366f1fddce78851729e07980972b 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionAdapter.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionAdapter.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Windows; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism.Wpf.Tests.Mocks { diff --git a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionBehavior.cs b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionBehavior.cs index 09cf57f9ef296c022a2959939799c8e84dba6df3..70d378da9f8e1609bf6ff65f0f9366bc7937c311 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionBehavior.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionBehavior.cs @@ -1,7 +1,7 @@ using System; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism.Wpf.Tests.Mocks { diff --git a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionBehaviorCollection.cs b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionBehaviorCollection.cs index 1bee17200b7c7ef480da7459fded9c0866ea628c..811ea66898dfe825d875f123bb3fc55bd07d2cd8 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionBehaviorCollection.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionBehaviorCollection.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism.Wpf.Tests.Mocks { diff --git a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionManager.cs b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionManager.cs index 838445b505c66c29346329e026b5f15b6013fca1..0d8d251f19e346dd696e4375f6ab07672964f025 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionManager.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionManager.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; using Prism.Ioc; using Prism.Navigation; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism.Wpf.Tests.Mocks { diff --git a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionManagerAccessor.cs b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionManagerAccessor.cs index 765c540016085a26a1d5f36a80bb3186edd452f8..eb5b50ba329ab944a40f5111d30f4c9a9985bf7f 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionManagerAccessor.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockRegionManagerAccessor.cs @@ -2,7 +2,7 @@ using System; using System.Windows; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism.Wpf.Tests.Mocks { diff --git a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockSortableViews.cs b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockSortableViews.cs index 75b4b0cc674199d85db608116245a2b0298c2060..ffb78cb4dfade50e134a8701592bd54977f0f3a9 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockSortableViews.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockSortableViews.cs @@ -1,6 +1,6 @@ -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism.Wpf.Tests.Mocks { diff --git a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockViewsCollection.cs b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockViewsCollection.cs index df4df2a950d0de370065000d565680fd33e7a19e..c2361489fb554bd78dc5d275cbe027443ebdf240 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Mocks/MockViewsCollection.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Mocks/MockViewsCollection.cs @@ -4,7 +4,7 @@ using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Collections.Specialized; -using Prism.Regions; +using Prism.Navigation.Regions; namespace Prism.Wpf.Tests.Mocks { diff --git a/tests/Wpf/Prism.Wpf.Tests/PrismApplicationBaseFixture.cs b/tests/Wpf/Prism.Wpf.Tests/PrismApplicationBaseFixture.cs index 3333374065894fcd902bf064c4c8ea412ec23402..56d54b79baba358f1431bf0a27e2b278ca1d04af 100644 --- a/tests/Wpf/Prism.Wpf.Tests/PrismApplicationBaseFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/PrismApplicationBaseFixture.cs @@ -6,8 +6,8 @@ using Moq; using Prism.Events; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; using Prism.Dialogs; using Xunit; @@ -259,7 +259,7 @@ namespace Prism.Wpf.Tests protected override void ConfigureViewModelLocator() { ConfigureViewModelLocatorWasCalled = true; - //setting this breaks other tests using VML. + //setting this breaks other tests using VML. //We need to revist those tests to ensure it is being reset each time. //base.ConfigureViewModelLocator(); } diff --git a/tests/Wpf/Prism.Wpf.Tests/PrismBootstapperBaseFixture.cs b/tests/Wpf/Prism.Wpf.Tests/PrismBootstapperBaseFixture.cs index 3ec78d075c794a95c27c71de6e3ed08484fdfc31..eaf8154ebbe0b7403de7d1e97abdacaa0bdfd201 100644 --- a/tests/Wpf/Prism.Wpf.Tests/PrismBootstapperBaseFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/PrismBootstapperBaseFixture.cs @@ -6,8 +6,8 @@ using Moq; using Prism.Events; using Prism.Ioc; using Prism.Modularity; -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; using Prism.Dialogs; using Xunit; @@ -253,7 +253,7 @@ namespace Prism.Wpf.Tests protected override void ConfigureViewModelLocator() { ConfigureViewModelLocatorWasCalled = true; - //setting this breaks other tests using VML. + //setting this breaks other tests using VML. //We need to revist those tests to ensure it is being reset each time. //base.ConfigureViewModelLocator(); } diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/AllActiveRegionFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/AllActiveRegionFixture.cs index 00cac8af809ef0eb7854e532eb85c33d74d40ac3..f9260d5350eb7174cbc00ab14054f0454d260d43 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/AllActiveRegionFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/AllActiveRegionFixture.cs @@ -1,7 +1,7 @@ using System; -using Prism.Regions; +using Prism.Navigation.Regions; using Xunit; namespace Prism.Wpf.Tests.Regions diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/AutoPopulateRegionBehaviorFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/AutoPopulateRegionBehaviorFixture.cs index a0903376ec4cd06837ca14cca9ea4cd755ec3bd9..321dea66cb1e9019cbbc86dea904688efa5071a0 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/AutoPopulateRegionBehaviorFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/AutoPopulateRegionBehaviorFixture.cs @@ -3,8 +3,8 @@ using System; using System.Collections.Generic; using Prism.Ioc; -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/BindRegionContextToDependencyObjectBehaviorFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/BindRegionContextToDependencyObjectBehaviorFixture.cs index 63f215da7490d145f9d173f9142d1d7562caac3a..bd3e14608628eb40fcb9cd45134410129facecc7 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/BindRegionContextToDependencyObjectBehaviorFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/BindRegionContextToDependencyObjectBehaviorFixture.cs @@ -1,7 +1,7 @@ -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/ClearChildViewsRegionBehaviorFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/ClearChildViewsRegionBehaviorFixture.cs index 27664139f2ecbe76fcd679c3700bdff811518acc..a5498594a7c04545ac9db4cb07b62d98e21cf492 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/ClearChildViewsRegionBehaviorFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/ClearChildViewsRegionBehaviorFixture.cs @@ -1,7 +1,7 @@ -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/DelayedRegionCreationBehaviorFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/DelayedRegionCreationBehaviorFixture.cs index 0bb878031fde4580330437ce99fb424ae30ae786..5c955580fb1614e0ad0bbcdb25aaf76e43a56a92 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/DelayedRegionCreationBehaviorFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/DelayedRegionCreationBehaviorFixture.cs @@ -3,8 +3,8 @@ using System; using System.Linq; using System.Windows; -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/RegionActiveAwareBehaviorFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/RegionActiveAwareBehaviorFixture.cs index 35134270c5cd835885692c20a4938a720c0f6bbe..d0f57ac893dab3fb72f5842256ed205c190354c7 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/RegionActiveAwareBehaviorFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/RegionActiveAwareBehaviorFixture.cs @@ -3,8 +3,8 @@ using System; using System.Windows; using Moq; -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/RegionManagerRegistrationBehaviorFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/RegionManagerRegistrationBehaviorFixture.cs index 6635b65cc0450007470f66992080e152f30a3668..01b731341b6b27a492ef0d03c764dbb7407a6dca 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/RegionManagerRegistrationBehaviorFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/RegionManagerRegistrationBehaviorFixture.cs @@ -5,8 +5,8 @@ using System.Threading.Tasks; using System.Windows.Controls; using Prism.Ioc; using Prism.Navigation; -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/RegionMemberLifetimeBehaviorFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/RegionMemberLifetimeBehaviorFixture.cs index 60a8f8cf2f7ada6b8ac7f714165af41d0d57faea..86b1cf1064590aadffb26568fc85ce5d80628637 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/RegionMemberLifetimeBehaviorFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/RegionMemberLifetimeBehaviorFixture.cs @@ -1,8 +1,8 @@ using Moq; -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/SelectorItemsSourceSyncRegionBehaviorFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/SelectorItemsSourceSyncRegionBehaviorFixture.cs index 8d4e3cca3efe221dec1850b0a3ce791caf3aa35e..35c26fc1374522c7969b370a4e559145d59e2759 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/SelectorItemsSourceSyncRegionBehaviorFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/SelectorItemsSourceSyncRegionBehaviorFixture.cs @@ -6,8 +6,8 @@ using System.Linq; using System.Windows.Controls; using System.Windows.Controls.Primitives; using System.Windows.Data; -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/SyncRegionContextWithHostBehaviorFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/SyncRegionContextWithHostBehaviorFixture.cs index 50d534595aeef473aff7ceb5416f253fd642cea7..c58df04768793a1895a7fff634d084d18b6bf762 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/SyncRegionContextWithHostBehaviorFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/Behaviors/SyncRegionContextWithHostBehaviorFixture.cs @@ -3,8 +3,8 @@ using System; using System.Windows; using Prism.Common; -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/ContentControlRegionAdapterFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/ContentControlRegionAdapterFixture.cs index d223e8531edfa50a0f992f9a0091debe6b10f40d..0027a4063acf9a6f0d2e52a02027b7e90252bc83 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/ContentControlRegionAdapterFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/ContentControlRegionAdapterFixture.cs @@ -4,7 +4,7 @@ using System; using System.Linq; using System.Windows.Controls; using System.Windows.Data; -using Prism.Regions; +using Prism.Navigation.Regions; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/ItemsControlRegionAdapterFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/ItemsControlRegionAdapterFixture.cs index f2e119d7b5b6df47ceef98ffa1ea4224b3831a10..8d4405cd3fd9ecbd2a4fdbb688d36ad3306ffcb5 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/ItemsControlRegionAdapterFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/ItemsControlRegionAdapterFixture.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Controls; using System.Windows.Data; -using Prism.Regions; +using Prism.Navigation.Regions; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/LocatorNavigationTargetHandlerFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/LocatorNavigationTargetHandlerFixture.cs index 1f9717eae7251c66a8bb5670e6b135b9d615fa56..99fa6bba3f8416cfe816f5b152e3766dc0718669 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/LocatorNavigationTargetHandlerFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/LocatorNavigationTargetHandlerFixture.cs @@ -4,7 +4,7 @@ using System; using System.Windows; using Moq; using Prism.Ioc; -using Prism.Regions; +using Prism.Navigation.Regions; using Xunit; namespace Prism.Wpf.Tests.Regions diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/NavigationAsyncExtensionsFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/NavigationAsyncExtensionsFixture.cs index dcdcc71a8812e31fd3f1e1af77710461066c4ace..8823bb4d778d8255b6e2f6b2d14b2fb39980ff29 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/NavigationAsyncExtensionsFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/NavigationAsyncExtensionsFixture.cs @@ -3,7 +3,7 @@ using System; using Moq; using Prism.Navigation; -using Prism.Regions; +using Prism.Navigation.Regions; using Xunit; namespace Prism.Wpf.Tests.Regions diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/NavigationContextFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/NavigationContextFixture.cs index 47515795229459e61b889b1c69572098541c5cee..f362adf918a4f38bcff59cb86637f7e401384cf2 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/NavigationContextFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/NavigationContextFixture.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using Moq; -using Prism.Regions; +using Prism.Navigation.Regions; using Xunit; namespace Prism.Wpf.Tests.Regions diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionAdapterBaseFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionAdapterBaseFixture.cs index 1b976130a84000be3b22e157c5e780725ad8fa82..c7c0da4b5050716c736b7fb41d3e0b279f6ede3d 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionAdapterBaseFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionAdapterBaseFixture.cs @@ -1,7 +1,7 @@ using System; -using Prism.Regions; +using Prism.Navigation.Regions; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionAdapterMappingsFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionAdapterMappingsFixture.cs index 78d18121e60951b45633d7c1c36f59f063d36695..7c9c6f460813de7a5c3a421a60be6d7d0a8a14e5 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionAdapterMappingsFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionAdapterMappingsFixture.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Windows.Controls; using Moq; using Prism.Ioc; -using Prism.Regions; +using Prism.Navigation.Regions; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionBehaviorCollectionFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionBehaviorCollectionFixture.cs index abe7dcfc9ac0dad86d9c56d63f92df64a405274c..7b0aa6e0fa35d948d3bc907c2fd54ad29b3b7165 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionBehaviorCollectionFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionBehaviorCollectionFixture.cs @@ -1,6 +1,6 @@ -using Prism.Regions; +using Prism.Navigation.Regions; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionBehaviorFactoryFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionBehaviorFactoryFixture.cs index c20db66a9c02648471c6f992f8303cc966a14a15..24ec205a4aae00bff4f7e9fd605eda44e62adc28 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionBehaviorFactoryFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionBehaviorFactoryFixture.cs @@ -4,7 +4,7 @@ using System; using System.Linq; using Moq; using Prism.Ioc; -using Prism.Regions; +using Prism.Navigation.Regions; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionBehaviorFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionBehaviorFixture.cs index 9bb27476914129cb797a3cf9011acfdaec8f4e41..1a867b7d730544e815c86a41ba916cb7ceed8e23 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionBehaviorFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionBehaviorFixture.cs @@ -1,7 +1,7 @@ using System; -using Prism.Regions; +using Prism.Navigation.Regions; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionFixture.cs index a3f01dc1a61fabeaf5b0d6dcec52443db8833775..66d69e91d50493cb6d855352f90735bd2d229920 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionFixture.cs @@ -4,7 +4,7 @@ using System.Linq; using Moq; using Prism.Ioc; using Prism.Navigation; -using Prism.Regions; +using Prism.Navigation.Regions; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionManagerFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionManagerFixture.cs index 0c67c26307b087beac00a5434580224931c108ab..2a33a938b767877cca1ec02f360851b330a0fd46 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionManagerFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionManagerFixture.cs @@ -4,7 +4,7 @@ using System.Collections.Specialized; using System.Threading.Tasks; using Moq; using Prism.Ioc; -using Prism.Regions; +using Prism.Navigation.Regions; using Prism.Wpf.Tests.Mocks; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionManagerRequestNavigateFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionManagerRequestNavigateFixture.cs index 7c86855dfb090bb4bb3cf10ecfc8b9d27409e13b..a6e1c4a2705db5ee94c23e56561f7bdc0b7d704e 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionManagerRequestNavigateFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionManagerRequestNavigateFixture.cs @@ -1,7 +1,7 @@ using System; using Moq; using Prism.Navigation; -using Prism.Regions; +using Prism.Navigation.Regions; using Xunit; namespace Prism.Wpf.Tests.Regions diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionNavigationJournalFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionNavigationJournalFixture.cs index a3ecf921d31eaa5b0145865419d383c7daf7f1e9..47d266c60d0e3ec3b2cc559698bfdf7554009c9e 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionNavigationJournalFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionNavigationJournalFixture.cs @@ -1,7 +1,7 @@ using System; using Moq; using Prism.Navigation; -using Prism.Regions; +using Prism.Navigation.Regions; using Xunit; namespace Prism.Wpf.Tests.Regions diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionNavigationServiceFixture.new.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionNavigationServiceFixture.new.cs index 862a09dcd2b42928c5ee85a820c15534f6e74fea..760a32cc7626f43c17d9bdecc366dc8a27e14ec3 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionNavigationServiceFixture.new.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionNavigationServiceFixture.new.cs @@ -5,7 +5,7 @@ using System.Windows; using Moq; using Prism.Ioc; using Prism.Navigation; -using Prism.Regions; +using Prism.Navigation.Regions; using Xunit; namespace Prism.Wpf.Tests.Regions diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionViewRegistryFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionViewRegistryFixture.cs index 925e45b25813282368440475116244c7fc9dd15b..2db2a9609cfd151bbf36719e56db1110b8a6e564 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/RegionViewRegistryFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/RegionViewRegistryFixture.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using System.Windows; using Moq; using Prism.Ioc; -using Prism.Regions; +using Prism.Navigation.Regions; using Prism.Wpf.Tests.Mvvm; using Xunit; diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/SelectorRegionAdapterFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/SelectorRegionAdapterFixture.cs index fdc34522909b05c7a934669a457c436dc46fa2e6..ece315fdccc1edc4a950719a7b27e759e1979c86 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/SelectorRegionAdapterFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/SelectorRegionAdapterFixture.cs @@ -3,8 +3,8 @@ using System; using System.Threading.Tasks; using System.Windows.Controls; -using Prism.Regions; -using Prism.Regions.Behaviors; +using Prism.Navigation.Regions; +using Prism.Navigation.Regions.Behaviors; using Xunit; namespace Prism.Wpf.Tests.Regions diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/SingleActiveRegionFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/SingleActiveRegionFixture.cs index 0483e041adc82509e117df4c767a88640826cfc8..944a2234442ff3d5bfc195084c490359a5a2a9d9 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/SingleActiveRegionFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/SingleActiveRegionFixture.cs @@ -1,6 +1,6 @@ -using Prism.Regions; +using Prism.Navigation.Regions; using Xunit; namespace Prism.Wpf.Tests.Regions diff --git a/tests/Wpf/Prism.Wpf.Tests/Regions/ViewsCollectionFixture.cs b/tests/Wpf/Prism.Wpf.Tests/Regions/ViewsCollectionFixture.cs index afc2a2f4d1a95be310e9a77bb9b49f0244b305b5..4a319821175597891b69f702c1704b22201f220e 100644 --- a/tests/Wpf/Prism.Wpf.Tests/Regions/ViewsCollectionFixture.cs +++ b/tests/Wpf/Prism.Wpf.Tests/Regions/ViewsCollectionFixture.cs @@ -6,7 +6,7 @@ using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; using System.Windows.Data; -using Prism.Regions; +using Prism.Navigation.Regions; using Prism.Wpf.Tests.Mocks; using Xunit;