Merge pull request MvvmCross#45 from MarcBruins/develop

Rotate dynamic width for menu
martijn00 · Oct 10, 2016 · 5bc8776 · 5bc8776
2 parents c677333 + 2ba7ef6
commit 5bc8776
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/MvvmCross.iOS.Support.XamarinSidebar/Hints/MvxSidebarActivePanelPresentationHint.cs b/MvvmCross.iOS.Support.XamarinSidebar/Hints/MvxSidebarActivePanelPresentationHint.cs
@@ -49,8 +49,8 @@ protected virtual void InitSidebar()
             var xamarinSidebarMenu = ViewController as IMvxSidebarMenu;
             if (xamarinSidebarMenu != null)
             {
+
                 sidebarController.HasShadowing = xamarinSidebarMenu.HasShadowing;
-                sidebarController.MenuWidth = xamarinSidebarMenu.MenuWidth;
 
                 barButtonItem = new UIBarButtonItem(xamarinSidebarMenu.MenuButtonImage
                     , UIBarButtonItemStyle.Plain
@@ -59,18 +59,22 @@ protected virtual void InitSidebar()
                         sidebarController.ViewWillAppear(false);
                         sidebarController.ToggleMenu();
                     });
+
+                sidebarController.StateChangeHandler += (object sender, bool e) =>
+                   {
+                       sidebarController.MenuWidth = xamarinSidebarMenu.MenuWidth;
+                       sidebarController.ViewWillAppear(false);
+                   };
             }
             else
             {
                 barButtonItem = new UIBarButtonItem("Menu"
                     , UIBarButtonItemStyle.Plain
                     , (sender, args) => {
-                        sidebarController.ViewWillAppear(false);
                         sidebarController.ToggleMenu();
                     });
             }
 
-
             var topViewController = SidebarPanelController.NavigationController.TopViewController;
 
             sidebarController.ChangeMenuView(ViewController);

diff --git a/MvvmCross_iOSSupport.sln b/MvvmCross_iOSSupport.sln
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.iOS.Support", "Mv
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SideMenuSample", "SideMenuSample", "{19AB8DF5-4F81-4E53-9CB7-FAFC410E98C7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.iOS.Support.iOS", "Samples\SideMenuSample\MvvmCross.iOS.Support.iOS\MvvmCross.iOS.Support.iOS.csproj", "{4B3F7784-069E-47EE-903A-25542CCF03C3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.iOS.Support.Sidepanels", "Samples\SideMenuSample\MvvmCross.iOS.Support.iOS\MvvmCross.iOS.Support.Sidepanels.csproj", "{4B3F7784-069E-47EE-903A-25542CCF03C3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.iOS.Support.Core", "Samples\SideMenuSample\MvvmCross.iOS.Support.Core\MvvmCross.iOS.Support.Core.csproj", "{760EE7E0-BC68-46A7-8AB3-4BE2D8C806FA}"
 EndProject

diff --git a/Samples/SideMenuSample/MvvmCross.iOS.Support.Sidebar/Setup.cs b/Samples/SideMenuSample/MvvmCross.iOS.Support.Sidebar/Setup.cs
@@ -34,7 +34,6 @@ protected override IMvxTrace CreateDebugTrace()
 		protected override IMvxIosViewPresenter CreatePresenter()
 		{
 			return new MvxSidebarPresenter((MvxApplicationDelegate)ApplicationDelegate, Window);
-			//return new MvxSidePanelsPresenter((MvxApplicationDelegate)ApplicationDelegate, Window);
 		}
 	}
 }
diff --git a/Samples/SideMenuSample/MvvmCross.iOS.Support.Sidebar/Views/BaseMenuViewController.cs b/Samples/SideMenuSample/MvvmCross.iOS.Support.Sidebar/Views/BaseMenuViewController.cs
@@ -10,6 +10,16 @@ public class BaseMenuViewController<TViewModel> : BaseViewController<TViewModel>
         public virtual UIImage MenuButtonImage => UIImage.FromBundle("threelines");
 
         public virtual bool HasShadowing => true;
-        public virtual int MenuWidth => 320;
+        private int MaxMenuWidth = 300;
+        private int MinSpaceRightOfTheMenu = 55;
+
+        public int MenuWidth => UserInterfaceIdiomIsPhone ?
+        int.Parse(UIScreen.MainScreen.Bounds.Width.ToString()) - MinSpaceRightOfTheMenu : MaxMenuWidth;
+
+        private bool UserInterfaceIdiomIsPhone
+        {
+            get { return UIDevice.CurrentDevice.UserInterfaceIdiom == UIUserInterfaceIdiom.Phone; }
+        }
+
     }
 }
diff --git a/...port.iOS/MvvmCross.iOS.Support.iOS.csproj → ...S/MvvmCross.iOS.Support.Sidepanels.csproj b/...port.iOS/MvvmCross.iOS.Support.iOS.csproj → ...S/MvvmCross.iOS.Support.Sidepanels.csproj