Permalink
Browse files

Move RxUI-Routing into RxUI-Core and RxUI-Xaml.

Move Validation back to RxUI-Core.
Validation classes are not available on WP and therefore currently cause compile errors.
  • Loading branch information...
1 parent 42809cb commit c095e49a639a55745db322d0422506b379d01d5c @jlaanstra jlaanstra committed Mar 21, 2013
Showing with 178 additions and 448 deletions.
  1. +0 −4 MobileSample-WP8/MobileSample-WP8.csproj
  2. +0 −4 MobileSample-WinRT/MobileSample-WinRT.csproj
  3. +0 −8 ReactiveUI.Blend/ReactiveUI.Blend_Net45.csproj
  4. +1 −5 ReactiveUI.Blend/ReactiveUI.Blend_WP8.csproj
  5. +0 −4 ReactiveUI.Mobile/ReactiveUI.Mobile_WP8.csproj
  6. +0 −4 ReactiveUI.Mobile/ReactiveUI.Mobile_WinRT.csproj
  7. +3 −3 ReactiveUI.NLog/ReactiveUI.NLog_Net45.csproj
  8. +0 −6 ReactiveUI.NLog/ReactiveUI.NLog_WP8.csproj
  9. +0 −90 ReactiveUI.Routing/Interfaces.cs
  10. +0 −11 ReactiveUI.Routing/ReactiveUI.Routing_Net45.csproj
  11. +0 −7 ReactiveUI.Routing/ReactiveUI.Routing_SL5.csproj
  12. +1 −8 ReactiveUI.Routing/ReactiveUI.Routing_WP7.csproj
  13. +0 −7 ReactiveUI.Routing/ReactiveUI.Routing_WP8.csproj
  14. +0 −8 ReactiveUI.Routing/ReactiveUI.Routing_WinRT.csproj
  15. +0 −18 ReactiveUI.Routing/ServiceLocationRegistration.cs
  16. +1 −7 ReactiveUI.Testing/ReactiveUI.Testing_Net45.csproj
  17. +0 −4 ReactiveUI.Tests/ReactiveUI.Tests_Net45.csproj
  18. 0 {ReactiveUI.Routing → ReactiveUI.Xaml}/AutoDataTemplateBindingHook.cs
  19. +3 −7 ReactiveUI.Xaml/ReactiveUI.Xaml_Net45.csproj
  20. +3 −1 ReactiveUI.Xaml/ReactiveUI.Xaml_SL5.csproj
  21. +3 −0 ReactiveUI.Xaml/ReactiveUI.Xaml_WP7.csproj
  22. +3 −6 ReactiveUI.Xaml/ReactiveUI.Xaml_WP8.csproj
  23. +4 −0 ReactiveUI.Xaml/ReactiveUI.Xaml_WinRT.csproj
  24. 0 {ReactiveUI.Routing → ReactiveUI.Xaml}/RoutedViewHost.cs
  25. +2 −1 ReactiveUI.Xaml/ServiceLocationRegistration.cs
  26. 0 ReactiveUI.Routing/WinRTShims.cs → ReactiveUI.Xaml/TransitioningContentControl.WinRT.cs
  27. 0 {ReactiveUI.Routing → ReactiveUI.Xaml}/ViewModelViewHost.cs
  28. +0 −180 ReactiveUI.sln
  29. +81 −0 ReactiveUI/Interfaces.cs
  30. +3 −0 ReactiveUI/ReactiveUI.csproj
  31. +3 −0 ReactiveUI/ReactiveUI_SL5.csproj
  32. +3 −0 ReactiveUI/ReactiveUI_WP7.csproj
  33. 0 {ReactiveUI.Routing → ReactiveUI}/RoutingState.cs
  34. 0 {ReactiveUI.Routing → ReactiveUI}/RxRouting.cs
  35. +64 −55 {ReactiveUI.Xaml → ReactiveUI}/Validation.cs
@@ -169,10 +169,6 @@
<Project>{B90F3D02-1E3A-4DD7-8E00-30F28B6DCC1E}</Project>
<Name>ReactiveUI.Mobile_WP8</Name>
</ProjectReference>
- <ProjectReference Include="..\ReactiveUI.Routing\ReactiveUI.Routing_WP8.csproj">
- <Project>{9F70B056-893E-487D-8DD1-C012C4440618}</Project>
- <Name>ReactiveUI.Routing_WP8</Name>
- </ProjectReference>
<ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WP8.csproj">
<Project>{F9459904-F785-4255-866A-A619787CB895}</Project>
<Name>ReactiveUI.Xaml_WP8</Name>
@@ -180,10 +180,6 @@
<Project>{30540f2b-0f4c-40a0-b3b6-ffddfa09d8fd}</Project>
<Name>ReactiveUI.Mobile_WinRT</Name>
</ProjectReference>
- <ProjectReference Include="..\ReactiveUI.Routing\ReactiveUI.Routing_WinRT.csproj">
- <Project>{b73da536-0ad8-40a1-a2a7-f8491ce584f6}</Project>
- <Name>ReactiveUI.Routing_WinRT</Name>
- </ProjectReference>
<ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WinRT.csproj">
<Project>{689ec7c5-2d81-4124-929e-397b330cc358}</Project>
<Name>ReactiveUI.Xaml_WinRT</Name>
@@ -83,14 +83,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_Net45.csproj">
- <Project>{761ac9ba-4a9c-440c-9b6c-2569978f0610}</Project>
- <Name>ReactiveUI.Xaml_Net45</Name>
- </ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_Net45.csproj">
- <Project>{292a477b-bb94-43c1-984e-e177ef9fedb7}</Project>
- <Name>ReactiveUI_Net45</Name>
- </ProjectReference>
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
<Project>{464cb812-f99f-401b-be4c-e8f0515cd19d}</Project>
<Name>ReactiveUI</Name>
@@ -96,10 +96,6 @@
<Project>{06C34984-B706-49BF-85BB-9282DD6238D1}</Project>
<Name>ReactiveUI.Xaml_WP8</Name>
</ProjectReference>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_WP8.csproj">
- <Project>{FAEA4F2E-017C-47AF-B467-4D2C7210CDEF}</Project>
- <Name>ReactiveUI_WP8</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
@@ -119,4 +115,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
@@ -126,10 +126,6 @@
<Compile Include="WP8AutoSuspendApplication.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Routing\ReactiveUI.Routing_WP8.csproj">
- <Project>{9F70B056-893E-487D-8DD1-C012C4440618}</Project>
- <Name>ReactiveUI.Routing_WP8</Name>
- </ProjectReference>
<ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WP8.csproj">
<Project>{06C34984-B706-49BF-85BB-9282DD6238D1}</Project>
<Name>ReactiveUI.Xaml_WP8</Name>
@@ -135,10 +135,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Routing\ReactiveUI.Routing_WinRT.csproj">
- <Project>{B73DA536-0AD8-40A1-A2A7-F8491CE584F6}</Project>
- <Name>ReactiveUI.Routing_WinRT</Name>
- </ProjectReference>
<ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WinRT.csproj">
<Project>{689ec7c5-2d81-4124-929e-397b330cc358}</Project>
<Name>ReactiveUI.Xaml_WinRT</Name>
@@ -132,9 +132,9 @@
<Compile Include="ServiceLocationRegistration.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_Net40.csproj">
- <Project>{292a477b-bb94-43c1-984e-e177ef9fedb7}</Project>
- <Name>ReactiveUI_Net40</Name>
+ <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
+ <Project>{464cb812-f99f-401b-be4c-e8f0515cd19d}</Project>
+ <Name>ReactiveUI</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -106,12 +106,6 @@
<Reference Include="System.Net" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_WP8.csproj">
- <Project>{FAEA4F2E-017C-47AF-B467-4D2C7210CDEF}</Project>
- <Name>ReactiveUI_WP8</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<Compile Include="NLogLogger.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServiceLocationRegistration.cs" />
@@ -1,90 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Subjects;
-using System.Text;
-using ReactiveUI.Xaml;
-
-namespace ReactiveUI.Routing
-{
- // NB: This is just a name we can bolt extension methods to
- public interface INavigateCommand : IReactiveCommand { }
-
- public interface IRoutingState : IReactiveNotifyPropertyChanged
- {
- /// <summary>
- /// Represents the current navigation stack, the last element in the
- /// collection being the currently visible ViewModel.
- /// </summary>
- ReactiveCollection<IRoutableViewModel> NavigationStack { get; }
-
- /// <summary>
- /// Navigates back to the previous element in the stack.
- /// </summary>
- IReactiveCommand NavigateBack { get; }
-
- /// <summary>
- /// Navigates to the a new element in the stack - the Execute parameter
- /// must be a ViewModel that implements IRoutableViewModel.
- /// </summary>
- INavigateCommand Navigate { get; }
-
- /// <summary>
- /// Navigates to a new element and resets the navigation stack (i.e. the
- /// new ViewModel will now be the only element in the stack) - the
- /// Execute parameter must be a ViewModel that implements
- /// IRoutableViewModel.
- /// </summary>
- INavigateCommand NavigateAndReset { get; }
- }
-
- /// <summary>
- /// Implement this interface for ViewModels that can be navigated to.
- /// </summary>
- public interface IRoutableViewModel : IReactiveNotifyPropertyChanged
- {
- /// <summary>
- /// A string token representing the current ViewModel, such as 'login' or 'user'
- /// </summary>
- string UrlPathSegment { get; }
-
- /// <summary>
- /// The IScreen that this ViewModel is currently being shown in. This
- /// is usually passed into the ViewModel in the Constructor and saved
- /// as a ReadOnly Property.
- /// </summary>
- IScreen HostScreen { get; }
- }
-
- /// <summary>
- /// IScreen represents any object that is hosting its own routing -
- /// usually this object is your AppViewModel or MainWindow object.
- /// </summary>
- public interface IScreen
- {
- /// <summary>
- /// The Router associated with this Screen.
- /// </summary>
- IRoutingState Router { get; }
- }
-
- /// <summary>
- /// Allows an additional string to make view resolution more specific than just a type.
- /// </summary>
- public class ViewContractAttribute : Attribute
- {
- /// <summary>
- /// A unique string that will be used along with the type to resolve a View
- /// </summary>
- public string Contract { get; set; }
- }
-
- public static class ObservableUtils
- {
- public static IConnectableObservable<T> PermaRef<T>(this IConnectableObservable<T> This)
- {
- This.Connect();
- return This;
- }
- }
-}
@@ -68,20 +68,9 @@
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
- <Compile Include="AutoDataTemplateBindingHook.cs" />
- <Compile Include="Interfaces.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="RoutingState.cs" />
- <Compile Include="RxRouting.cs" />
- <Compile Include="RoutedViewHost.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- <Compile Include="ViewModelViewHost.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_Net45.csproj">
- <Project>{761ac9ba-4a9c-440c-9b6c-2569978f0610}</Project>
- <Name>ReactiveUI.Xaml_Net45</Name>
- </ProjectReference>
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
<Project>{464cb812-f99f-401b-be4c-e8f0515cd19d}</Project>
<Name>ReactiveUI</Name>
@@ -88,14 +88,7 @@
<Reference Include="System.Windows.Browser" />
</ItemGroup>
<ItemGroup>
- <Compile Include="AutoDataTemplateBindingHook.cs" />
- <Compile Include="Interfaces.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="RoutedViewHost.cs" />
- <Compile Include="RoutingState.cs" />
- <Compile Include="RxRouting.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- <Compile Include="ViewModelViewHost.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_SL5.csproj">
@@ -114,14 +114,7 @@
<Reference Include="System.Net" />
</ItemGroup>
<ItemGroup>
- <Compile Include="AutoDataTemplateBindingHook.cs" />
- <Compile Include="Interfaces.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="RoutedViewHost.cs" />
- <Compile Include="RoutingState.cs" />
- <Compile Include="RxRouting.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- <Compile Include="ViewModelViewHost.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WP7.csproj">
@@ -144,4 +137,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
@@ -111,14 +111,7 @@
<Reference Include="System.Net" />
</ItemGroup>
<ItemGroup>
- <Compile Include="AutoDataTemplateBindingHook.cs" />
- <Compile Include="Interfaces.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="RoutedViewHost.cs" />
- <Compile Include="RoutingState.cs" />
- <Compile Include="RxRouting.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- <Compile Include="ViewModelViewHost.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WP8.csproj">
@@ -34,15 +34,7 @@
<DocumentationFile>bin\Release\WinRT45\ReactiveUI.Routing_WinRT.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Compile Include="AutoDataTemplateBindingHook.cs" />
- <Compile Include="Interfaces.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="RoutedViewHost.cs" />
- <Compile Include="RoutingState.cs" />
- <Compile Include="RxRouting.cs" />
- <Compile Include="ServiceLocationRegistration.cs" />
- <Compile Include="ViewModelViewHost.cs" />
- <Compile Include="WinRTShims.cs" />
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ReactiveUI.Routing
-{
- public class ServiceLocationRegistration : IWantsToRegisterStuff
- {
- public void Register()
- {
-#if !MONO
- RxApp.Register(typeof(AutoDataTemplateBindingHook), typeof(IPropertyBindingHook));
-#endif
- }
- }
-}
@@ -134,12 +134,6 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_Net45.csproj">
- <Project>{292a477b-bb94-43c1-984e-e177ef9fedb7}</Project>
- <Name>ReactiveUI_Net45</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
@@ -158,4 +152,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
@@ -137,10 +137,6 @@
<Project>{08d3606b-ee79-43ee-8382-72a1091f1f30}</Project>
<Name>ReactiveUI.NLog_Net45</Name>
</ProjectReference>
- <ProjectReference Include="..\ReactiveUI.Routing\ReactiveUI.Routing_Net45.csproj">
- <Project>{1b7576e0-f1b6-41a7-b607-b521dea1daa9}</Project>
- <Name>ReactiveUI.Routing_Net45</Name>
- </ProjectReference>
<ProjectReference Include="..\ReactiveUI.Testing\ReactiveUI.Testing_Net45.csproj">
<Project>{dd99fd0f-82f6-4c30-930e-4a1d0df01d65}</Project>
<Name>ReactiveUI.Testing_Net45</Name>
@@ -130,16 +130,18 @@
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="AutoDataTemplateBindingHook.cs" />
<Compile Include="BindingTypeConverters.cs" />
<Compile Include="CommandBinding.cs" />
<Compile Include="CreatesCommandBinding.cs" />
<Compile Include="DependencyObjectObservableForProperty.cs" />
<Compile Include="Errors.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="RoutedViewHost.cs" />
<Compile Include="SampleDataBinder.cs" />
<Compile Include="ServiceLocationRegistration.cs" />
<Compile Include="TransitioningContentControl.cs" />
- <Compile Include="Validation.cs" />
+ <Compile Include="ViewModelViewHost.cs" />
<Compile Include="WaitForDispatcherScheduler.cs" />
<Compile Include="XamlDefaultPropertyBinding.cs" />
</ItemGroup>
@@ -150,12 +152,6 @@
</Page>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI\ReactiveUI_Net45.csproj">
- <Project>{292a477b-bb94-43c1-984e-e177ef9fedb7}</Project>
- <Name>ReactiveUI_Net45</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
@@ -88,16 +88,18 @@
<Reference Include="System.Windows.Browser" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="AutoDataTemplateBindingHook.cs" />
<Compile Include="BindingTypeConverters.cs" />
<Compile Include="CommandBinding.cs" />
<Compile Include="CreatesCommandBinding.cs" />
<Compile Include="DependencyObjectObservableForProperty.cs" />
<Compile Include="Errors.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="RoutedViewHost.cs" />
<Compile Include="SampleDataBinder.cs" />
<Compile Include="ServiceLocationRegistration.cs" />
<Compile Include="TransitioningContentControl.cs" />
- <Compile Include="Validation.cs" />
+ <Compile Include="ViewModelViewHost.cs" />
<Compile Include="WaitForDispatcherScheduler.cs" />
<Compile Include="XamlDefaultPropertyBinding.cs" />
</ItemGroup>
Oops, something went wrong.

0 comments on commit c095e49

Please sign in to comment.