Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[housekeeping] Automated PR to fix formatting errors #872

Merged
merged 1 commit into from
Apr 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,18 @@
using Android.Content.Res;
using Android.Graphics;
using Android.Graphics.Drawables;
using Android.OS;
using Android.Runtime;
using Android.Util;
using Android.Views;
using Android.Widget;
using AndroidX.AppCompat.App;
using AndroidX.AppCompat.Graphics.Drawable;
using AndroidX.AppCompat.Widget;
using AndroidX.DrawerLayout.Widget;
using AndroidX.Lifecycle;
using AndroidX.Navigation;
using AndroidX.Navigation.Fragment;
using Microsoft.Maui.Controls.Internals;
using Microsoft.Maui.Controls.Platform;
using Microsoft.Maui.Graphics;
Expand All @@ -31,12 +36,6 @@
using FragmentTransaction = AndroidX.Fragment.App.FragmentTransaction;
using Object = Java.Lang.Object;

using AndroidX.Navigation.Fragment;
using AndroidX.Navigation;
using Android.OS;
using AndroidX.AppCompat.Widget;
using AndroidX.Lifecycle;

namespace Microsoft.Maui.Controls.Handlers
{
public partial class NavigationPageHandler :
Expand All @@ -60,7 +59,7 @@ protected override void ConnectHandler(AView nativeView)
.GetFragmentManager()
.FindFragmentById(Resource.Id.nav_host);

FragmentNavigator =
FragmentNavigator =
(FragmentNavigator)NavHost
.NavController
.NavigatorProvider
Expand All @@ -82,10 +81,10 @@ protected override void ConnectHandler(AView nativeView)
var inflater = NavHost.NavController.NavInflater;
NavGraph graph = new NavGraph(navGraphNavigator);
System.Diagnostics.Debug.WriteLine($"RABBIT {graph.NavigatorName}");

NavDestination navDestination = null;
List<int> destinations = new List<int>();
foreach(var page in VirtualView.Navigation.NavigationStack)
foreach (var page in VirtualView.Navigation.NavigationStack)
{
navDestination =
MauiFragmentNavDestination.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ public partial class NavigationPageHandler
public static PropertyMapper<NavigationPage, NavigationPageHandler> NavigationPageMapper
= new PropertyMapper<NavigationPage, NavigationPageHandler>(ViewHandler.ViewMapper)
{
[NavigationPage.BarTextColorProperty.PropertyName] = MapTitleColor,
[NavigationPage.BarBackgroundColorProperty.PropertyName] = MapNavigationBarBackground,
[NavigationPage.BarBackgroundProperty.PropertyName] = MapNavigationBarBackground,
[nameof(IPadding.Padding)] = MapPadding,
[nameof(NavigationPage.TitleIconImageSourceProperty.PropertyName)] = MapTitleIcon,
[nameof(NavigationPage.TitleViewProperty.PropertyName)] = MapTitleView,
[NavigationPage.BarTextColorProperty.PropertyName] = MapTitleColor,
[NavigationPage.BarBackgroundColorProperty.PropertyName] = MapNavigationBarBackground,
[NavigationPage.BarBackgroundProperty.PropertyName] = MapNavigationBarBackground,
[nameof(IPadding.Padding)] = MapPadding,
[nameof(NavigationPage.TitleIconImageSourceProperty.PropertyName)] = MapTitleIcon,
[nameof(NavigationPage.TitleViewProperty.PropertyName)] = MapTitleView,

#if WINDOWS
[nameof(ToolbarPlacementProperty.PropertyName)] = MapToolbarPlacement,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class NavHostPageFragment : Fragment

protected NavHostPageFragment(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
{

}

public NavHostPageFragment()
Expand Down Expand Up @@ -61,7 +61,7 @@ class ProcessBackClick : AndroidX.Activity.OnBackPressedCallback
{
NavHostPageFragment _navHostPageFragment;

public ProcessBackClick(NavHostPageFragment navHostPageFragment)
public ProcessBackClick(NavHostPageFragment navHostPageFragment)
: base(true)
{
_navHostPageFragment = navHostPageFragment;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
//#nullable enable
using System;
using UIKit;
using Microsoft.Maui.Controls.Handlers;
using Foundation;
using System.Threading.Tasks;
using ObjCRuntime;
using System.Collections.Generic;
using Microsoft.Maui.Handlers;
using System.Linq;
using System.Threading.Tasks;
using Foundation;
using Microsoft.Maui.Controls.Handlers;
using Microsoft.Maui.Controls.Internals;
using Microsoft.Maui.Handlers;
using ObjCRuntime;
using UIKit;

namespace Microsoft.Maui.Controls.Platform
{
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Handlers/Page/PageHandler.iOS.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public override void SetVirtualView(IView view)

public static void MapTitle(PageHandler handler, IPage page)
{
if(handler._pageViewController != null)
if (handler._pageViewController != null)
handler._pageViewController.Title = page.Title;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/iOS/ContainerViewController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public IView? CurrentView
set => SetView(value);
}

public UIView? CurrentNativeView
public UIView? CurrentNativeView
=> _pendingLoadedView ?? currentNativeView;

public IMauiContext? Context { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/iOS/LayoutView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public override void LayoutSubviews()

public class PageViewController : ContainerViewController
{
public PageViewController(IPage page,IMauiContext mauiContext)
public PageViewController(IPage page, IMauiContext mauiContext)
{
CurrentView = page;
Context = mauiContext;
Expand Down