Minor refactorings.

Author: Michael Pham

src/Demo/Demo/Views/MenuView.xaml

@@ -11,8 +11,8 @@
       </StackLayout>
     </controls:NavigationLayout.HeaderView>
     <controls:NavigationLayout.Children>
-      <controls:NavigationMenu Command="{Binding HomeCommand}" Text="{Binding HomeText}" />
-      <controls:NavigationMenu Command="{Binding LoremIpsumCommand}" Text="{Binding LoremIpsumText}" />
+      <controls:NavigationLayoutMenu Command="{Binding HomeCommand}" Text="{Binding HomeText}" />
+      <controls:NavigationLayoutMenu Command="{Binding LoremIpsumCommand}" Text="{Binding LoremIpsumText}" />
     </controls:NavigationLayout.Children>
   </controls:NavigationLayout>
 </ContentPage>

src/NativeCode.Mobile.AppCompat.Controls/NativeCode.Mobile.AppCompat.Controls.csproj

@@ -39,7 +39,7 @@
     <Compile Include="FloatingButtonSize.cs" />
     <Compile Include="ICommandProvider.cs" />
     <Compile Include="NavigationLayout.cs" />
-    <Compile Include="NavigationMenu.cs" />
+    <Compile Include="NavigationLayoutMenu.cs" />
     <Compile Include="Platforms\IUserNotifier.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

src/NativeCode.Mobile.AppCompat.Controls/NavigationLayout.cs

@@ -2,7 +2,7 @@
 {
     using Xamarin.Forms;
 
-    public class NavigationLayout : Layout<NavigationMenu>
+    public class NavigationLayout : Layout<NavigationLayoutMenu>
     {
         public static readonly BindableProperty HeaderViewProperty = BindableProperty.Create<NavigationLayout, View>(x => x.HeaderView, default(View));
 

src/NativeCode.Mobile.AppCompat.Controls/NavigationMenu.cs renamed to src/NativeCode.Mobile.AppCompat.Controls/NavigationLayoutMenu.cs

@@ -4,17 +4,17 @@
 
     using Xamarin.Forms;
 
-    public class NavigationMenu : View, ICommandProvider
+    public class NavigationLayoutMenu : View, ICommandProvider
     {
-        public static readonly BindableProperty CommandProperty = BindableProperty.Create<NavigationMenu, ICommand>(x => x.Command, default(ICommand));
+        public static readonly BindableProperty CommandProperty = BindableProperty.Create<NavigationLayoutMenu, ICommand>(x => x.Command, default(ICommand));
 
-        public static readonly BindableProperty CommandParameterProperty = BindableProperty.Create<NavigationMenu, object>(
+        public static readonly BindableProperty CommandParameterProperty = BindableProperty.Create<NavigationLayoutMenu, object>(
             x => x.CommandParameter,
             default(object));
 
-        public static readonly BindableProperty IconProperty = BindableProperty.Create<NavigationMenu, ImageSource>(x => x.Icon, default(ImageSource));
+        public static readonly BindableProperty IconProperty = BindableProperty.Create<NavigationLayoutMenu, ImageSource>(x => x.Icon, default(ImageSource));
 
-        public static readonly BindableProperty TextProperty = BindableProperty.Create<NavigationMenu, string>(x => x.Text, default(string));
+        public static readonly BindableProperty TextProperty = BindableProperty.Create<NavigationLayoutMenu, string>(x => x.Text, default(string));
 
         public ICommand Command
         {

src/NativeCode.Mobile.AppCompat.Renderers/Renderers/AppCompatMasterDetailRenderer.cs

@@ -13,11 +13,11 @@ namespace NativeCode.Mobile.AppCompat.Renderers.Renderers
 
     public class AppCompatMasterDetailRenderer : MasterDetailRenderer
     {
-        private CustomActionBarDrawerToggle toggle;
+        private CustomActionBarDrawerToggle actionBarDrawerToggle;
 
         public override void SetDrawerListener(IDrawerListener listener)
         {
-            base.SetDrawerListener(this.toggle);
+            base.SetDrawerListener(this.actionBarDrawerToggle);
         }
 
         protected override void OnElementChanged(VisualElement oldElement, VisualElement newElement)
@@ -29,53 +29,53 @@ protected override void OnElementChanged(VisualElement oldElement, VisualElement
                 this.SetFitsSystemWindows(true);
 
                 var activity = (Activity)this.Context;
-                this.toggle = new CustomActionBarDrawerToggle(this, activity, this) { DrawerIndicatorEnabled = true };
+                this.actionBarDrawerToggle = new CustomActionBarDrawerToggle(this, activity, this) { DrawerIndicatorEnabled = true };
 
                 var actionbar = this.Context.GetSupportActionBar();
                 actionbar.SetDisplayHomeAsUpEnabled(true);
                 actionbar.SetHomeButtonEnabled(true);
 
-                this.toggle.SyncState();
+                this.actionBarDrawerToggle.SyncState();
             }
         }
 
         private class CustomActionBarDrawerToggle : ActionBarDrawerToggle
         {
             private readonly AppCompatDelegate appCompatDelegate;
 
-            private readonly AppCompatMasterDetailRenderer renderer;
+            private readonly AppCompatMasterDetailRenderer owner;
 
-            public CustomActionBarDrawerToggle(AppCompatMasterDetailRenderer renderer, Activity activity, DrawerLayout drawerLayout)
+            public CustomActionBarDrawerToggle(AppCompatMasterDetailRenderer owner, Activity activity, DrawerLayout drawerLayout)
                 : base(activity, drawerLayout, Resource.String.navigation_drawer_open, Resource.String.navigation_drawer_close)
             {
-                this.renderer = renderer;
                 this.appCompatDelegate = activity.GetAppCompatDelegate();
+                this.owner = owner;
             }
 
             public override void OnDrawerClosed(View drawerView)
             {
                 base.OnDrawerClosed(drawerView);
                 this.appCompatDelegate.InvalidateOptionsMenu();
-                this.renderer.OnDrawerClosed(drawerView);
+                this.owner.OnDrawerClosed(drawerView);
             }
 
             public override void OnDrawerOpened(View drawerView)
             {
                 base.OnDrawerOpened(drawerView);
                 this.appCompatDelegate.InvalidateOptionsMenu();
-                this.renderer.OnDrawerOpened(drawerView);
+                this.owner.OnDrawerOpened(drawerView);
             }
 
             public override void OnDrawerSlide(View drawerView, float slideOffset)
             {
                 base.OnDrawerSlide(drawerView, slideOffset);
-                this.renderer.OnDrawerSlide(drawerView, slideOffset);
+                this.owner.OnDrawerSlide(drawerView, slideOffset);
             }
 
             public override void OnDrawerStateChanged(int newState)
             {
                 base.OnDrawerStateChanged(newState);
-                this.renderer.OnDrawerStateChanged(newState);
+                this.owner.OnDrawerStateChanged(newState);
             }
         }
     }

src/NativeCode.Mobile.AppCompat.Renderers/Renderers/NavigationLayoutRenderer.cs

@@ -20,7 +20,7 @@ namespace NativeCode.Mobile.AppCompat.Renderers.Renderers
 
     public class NavigationLayoutRenderer : ViewRenderer<NavigationLayout, NavigationView>, NavigationView.IOnNavigationItemSelectedListener
     {
-        private readonly Dictionary<IMenuItem, NavigationMenu> mappings = new Dictionary<IMenuItem, NavigationMenu>();
+        private readonly Dictionary<IMenuItem, NavigationLayoutMenu> mappings = new Dictionary<IMenuItem, NavigationLayoutMenu>();
 
         public bool OnNavigationItemSelected(IMenuItem menuItem)
         {
@@ -60,6 +60,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<NavigationLayou
                 var control = new NavigationView(context);
                 control.SetFitsSystemWindows(true);
                 control.SetNavigationItemSelectedListener(this);
+
                 this.SetNativeControl(control);
 
                 this.UpdateHeaderView();
@@ -71,6 +72,7 @@ private void UpdateHeaderView()
         {
             if (this.Element.HeaderView != null)
             {
+                // TODO: It's adding it, but it never shows up in the XML in monitor.
                 var renderer = RendererFactory.GetRenderer(this.Element.HeaderView);
                 this.Control.AddHeaderView(renderer.ViewGroup);
             }
@@ -82,7 +84,8 @@ private void UpdateMenuItems()
 
             for (var index = 0; index < this.Element.Children.Count; index++)
             {
-                var menu = this.Element.Children[index];
+                // NOTE: Not sure if it's just my local machine or not, but this doesn't seem to resolve until compile-time.
+                var menu = (NavigationLayoutMenu)this.Element.Children[index];
                 var item = this.Control.Menu.Add(0, index, index, menu.Text);
 
                 if (menu.Icon != null)