Skip to content

Commit

Permalink
Merge pull request #2342 from PrismLibrary/housekeeping/fix-codeforma…
Browse files Browse the repository at this point in the history
…tting

[housekeeping] Automated PR to fix formatting errors
  • Loading branch information
dansiegel authored Mar 1, 2021
2 parents 7b8b6c3 + 6075257 commit 342689b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Forms/Prism.Forms/Navigation/PageNavigationService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ protected virtual Task ProcessNavigationForAbsoulteUri(Queue<string> segments, I
{
return ProcessNavigationForAbsoluteUri(segments, parameters, useModalNavigation, animated);
}

protected virtual Task ProcessNavigationForAbsoluteUri(Queue<string> segments, INavigationParameters parameters, bool? useModalNavigation, bool animated)
{
return ProcessNavigation(null, segments, parameters, useModalNavigation, animated);
Expand Down
4 changes: 2 additions & 2 deletions src/Forms/Prism.Forms/Navigation/Xaml/Navigation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public static INavigationService GetNavigationService(Page page)

navService = CreateNavigationService(currentScope, page);
}
else if(navService is IPageAware pa && pa.Page != page)
else if (navService is IPageAware pa && pa.Page != page)
{
var scope = container.CreateScope();
page.SetValue(NavigationScopeProperty, scope);
Expand All @@ -111,7 +111,7 @@ public static INavigationService GetNavigationService(Page page)
private static INavigationService CreateNavigationService(IScopedProvider scope, Page page)
{
var navService = scope.Resolve<INavigationService>();
switch(navService)
switch (navService)
{
case IPageAware pa when pa.Page is null:
pa.Page = page;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ public void RegisterInstance_RegistersLazy()
Assert.Same(service, Setup.Container.Resolve<Lazy<IServiceA>>().Value);
}



#if !UNITY

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ public class XamlMasterDetailViewMockViewModel
public XamlMasterDetailViewMockViewModel(INavigationService navigationService)
{
NavigationService = navigationService;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ public XamlMasterDetailViewMock()
InitializeComponent();
}
}
}
}

0 comments on commit 342689b

Please sign in to comment.