From 98ae1e8bc51fbe56396d8e0f51d799f104a08d8f Mon Sep 17 00:00:00 2001 From: Amy Burns Date: Thu, 16 Jul 2015 18:29:30 -0400 Subject: [PATCH] [Split View] Updating recipe for Unified API --- .../AppDelegate.cs | 4 +-- .../DetailViewController.cs | 10 +++---- .../Info.plist | 2 ++ .../Main.cs | 4 +-- .../MasterViewController.cs | 4 +-- .../SplitView3.csproj | 9 ++++--- .../SplitViewContoller.cs | 4 +-- .../SplitMultiDetailDemo/AppDelegate.cs | 4 +-- .../SplitMultiDetailDemo/ColorsController.cs | 4 +-- .../SplitMultiDetailDemo/Info.plist | 26 +++++++++---------- .../SplitMultiDetailDemo/Main.cs | 4 +-- .../SplitMultiDetailDemo.csproj | 12 ++++++--- .../SplitViewContoller.cs | 6 ++--- 13 files changed, 52 insertions(+), 41 deletions(-) diff --git a/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/AppDelegate.cs b/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/AppDelegate.cs index f9fd040..5371922 100644 --- a/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/AppDelegate.cs +++ b/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/AppDelegate.cs @@ -2,8 +2,8 @@ using System; using System.Collections.Generic; using System.Linq; -using MonoTouch.Foundation; -using MonoTouch.UIKit; +using Foundation; +using UIKit; namespace SplitView { diff --git a/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/DetailViewController.cs b/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/DetailViewController.cs index ad2d210..d54ea62 100644 --- a/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/DetailViewController.cs +++ b/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/DetailViewController.cs @@ -1,7 +1,7 @@ using System; -using System.Drawing; -using MonoTouch.UIKit; -using MonoTouch.CoreFoundation; +using CoreGraphics; +using UIKit; +using CoreFoundation; namespace SplitView { public class DetailViewController : UIViewController @@ -16,12 +16,12 @@ namespace SplitView { View.BackgroundColor = UIColor.White; - label = new UILabel(new RectangleF(100,100,450,60)); + label = new UILabel(new CGRect(100,100,450,60)); label.Font = UIFont.SystemFontOfSize(24f); Update (1); // defaults to "1" View.AddSubview (label); // add a toolbar to host the master view popover (when it is required, in portrait) - toolbar = new UIToolbar(new RectangleF(0, 0, View.Frame.Width, 30)); + toolbar = new UIToolbar(new CGRect(0, 0, View.Frame.Width, 30)); toolbar.AutoresizingMask = UIViewAutoresizing.FlexibleWidth; View.AddSubview(toolbar); } diff --git a/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/Info.plist b/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/Info.plist index c2a656b..31848e8 100644 --- a/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/Info.plist +++ b/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/Info.plist @@ -19,5 +19,7 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + MinimumOSVersion + 5.1.1 diff --git a/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/Main.cs b/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/Main.cs index 6fe0fdf..4d7106b 100644 --- a/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/Main.cs +++ b/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/Main.cs @@ -2,8 +2,8 @@ using System; using System.Collections.Generic; using System.Linq; -using MonoTouch.Foundation; -using MonoTouch.UIKit; +using Foundation; +using UIKit; namespace SplitView { diff --git a/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/MasterViewController.cs b/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/MasterViewController.cs index 7b1b980..a2085fd 100644 --- a/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/MasterViewController.cs +++ b/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/MasterViewController.cs @@ -1,8 +1,8 @@ using System; using System.Linq; using MonoTouch.Dialog; -using MonoTouch.UIKit; -using MonoTouch.CoreFoundation; +using UIKit; +using CoreFoundation; namespace SplitView { public class MasterViewController : DialogViewController { diff --git a/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/SplitView3.csproj b/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/SplitView3.csproj index a78094c..f7b389a 100644 --- a/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/SplitView3.csproj +++ b/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/SplitView3.csproj @@ -6,10 +6,12 @@ 10.0.0 2.0 {D0CC8E58-26BB-481F-81A5-5787766C445D} - {6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Exe SplitView SplitView + Xamarin.iOS + v1.0 true @@ -58,13 +60,14 @@ 4 false iPhone Developer + ARMv7, ARM64 - + @@ -76,5 +79,5 @@ - + \ No newline at end of file diff --git a/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/SplitViewContoller.cs b/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/SplitViewContoller.cs index 3dfc3e0..a5d6be5 100644 --- a/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/SplitViewContoller.cs +++ b/ios/content_controls/split_view/communicate_between_master_and_detail_controllers/SplitViewContoller.cs @@ -1,6 +1,6 @@ using System; -using MonoTouch.UIKit; -using MonoTouch.CoreFoundation; +using UIKit; +using CoreFoundation; namespace SplitView { public class SplitViewContoller : UISplitViewController diff --git a/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/AppDelegate.cs b/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/AppDelegate.cs index 7f57a12..0736d74 100644 --- a/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/AppDelegate.cs +++ b/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/AppDelegate.cs @@ -2,8 +2,8 @@ using System; using System.Collections.Generic; using System.Linq; -using MonoTouch.Foundation; -using MonoTouch.UIKit; +using Foundation; +using UIKit; namespace SplitMultiDetailDemo { diff --git a/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/ColorsController.cs b/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/ColorsController.cs index 8be3395..0dfc270 100644 --- a/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/ColorsController.cs +++ b/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/ColorsController.cs @@ -2,8 +2,8 @@ using System; using System.Linq; using System.Collections.Generic; using MonoTouch.Dialog; -using MonoTouch.UIKit; -using MonoTouch.CoreFoundation; +using UIKit; +using CoreFoundation; namespace SplitMultiDetailDemo { diff --git a/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/Info.plist b/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/Info.plist index 90a0bc3..a85dc28 100644 --- a/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/Info.plist +++ b/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/Info.plist @@ -2,18 +2,18 @@ - UIDeviceFamily - - 2 - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - MinimumOSVersion - 3.2 + UIDeviceFamily + + 2 + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + MinimumOSVersion + 5.1.1 diff --git a/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/Main.cs b/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/Main.cs index 840aafa..c7fb01a 100644 --- a/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/Main.cs +++ b/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/Main.cs @@ -2,8 +2,8 @@ using System; using System.Collections.Generic; using System.Linq; -using MonoTouch.Foundation; -using MonoTouch.UIKit; +using Foundation; +using UIKit; namespace SplitMultiDetailDemo { diff --git a/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/SplitMultiDetailDemo.csproj b/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/SplitMultiDetailDemo.csproj index b56a630..ebad3fe 100644 --- a/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/SplitMultiDetailDemo.csproj +++ b/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/SplitMultiDetailDemo.csproj @@ -6,11 +6,13 @@ 10.0.0 2.0 {53BC16FE-64F9-494B-B365-211659CB992A} - {6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Exe SplitMultiDetailDemo Resources SplitMultiDetailDemo + Xamarin.iOS + v1.0 True @@ -46,6 +48,7 @@ iPhone Developer True True + ARMv7 none @@ -55,6 +58,7 @@ 4 False iPhone Developer + ARMv7, ARM64 none @@ -65,6 +69,7 @@ False True iPhone Distribution + ARMv7, ARM64 none @@ -74,13 +79,14 @@ 4 False iPhone Distribution + ARMv7, ARM64 - + @@ -91,7 +97,6 @@ - @@ -102,4 +107,5 @@ + \ No newline at end of file diff --git a/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/SplitViewContoller.cs b/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/SplitViewContoller.cs index 49d2e97..837f351 100644 --- a/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/SplitViewContoller.cs +++ b/ios/content_controls/split_view/use_multiple_detail_controllers/SplitMultiDetailDemo/SplitViewContoller.cs @@ -1,7 +1,7 @@ using System; -using MonoTouch.UIKit; -using MonoTouch.CoreFoundation; -using System.Drawing; +using UIKit; +using CoreFoundation; +using CoreGraphics; namespace SplitMultiDetailDemo {