diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/AnimationSamples.csproj b/EvolveGraphicsAndAnimation/AnimationSamples/AnimationSamples.csproj index dd8d98e0..3a7976f4 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/AnimationSamples.csproj +++ b/EvolveGraphicsAndAnimation/AnimationSamples/AnimationSamples.csproj @@ -17,12 +17,13 @@ full False bin\iPhoneSimulator\Debug - DEBUG; + DEBUG;XAMCORE_2_0;ARCH_64 prompt 4 False None True + --registrar:static --nofastsim --override-abi x86_64 none @@ -79,7 +80,9 @@ - + + \Developer\MonoTouch\usr\lib\mono\Xamarin.iOS\Xamarin.iOS.dll + @@ -130,4 +133,4 @@ - \ No newline at end of file + diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/AnimationSamplesViewController.cs b/EvolveGraphicsAndAnimation/AnimationSamples/AnimationSamplesViewController.cs index dd155ec9..5e547db2 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/AnimationSamplesViewController.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/AnimationSamplesViewController.cs @@ -1,8 +1,8 @@ using System; -using System.Drawing; +using CoreGraphics; -using MonoTouch.Foundation; -using MonoTouch.UIKit; +using Foundation; +using UIKit; namespace AnimationSamples { diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/AnimationSamplesViewController.designer.cs b/EvolveGraphicsAndAnimation/AnimationSamples/AnimationSamplesViewController.designer.cs index 09472961..09517e1d 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/AnimationSamplesViewController.designer.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/AnimationSamplesViewController.designer.cs @@ -4,7 +4,7 @@ // actions made in the Xcode designer. If it is removed, they will be lost. // Manual changes to this file may not be handled correctly. // -using MonoTouch.Foundation; +using Foundation; namespace AnimationSamples { @@ -12,7 +12,7 @@ namespace AnimationSamples partial class AnimationSamplesViewController { [Outlet] - MonoTouch.UIKit.UIButton TransitionButton { get; set; } + UIKit.UIButton TransitionButton { get; set; } void ReleaseDesignerOutlets () { diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/AppDelegate.cs b/EvolveGraphicsAndAnimation/AnimationSamples/AppDelegate.cs index e2bf90de..d2ad7c49 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/AppDelegate.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/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 AnimationSamples { diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/DemoViewTransition.cs b/EvolveGraphicsAndAnimation/AnimationSamples/DemoViewTransition.cs index 9495f5e4..0cbfee4f 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/DemoViewTransition.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/DemoViewTransition.cs @@ -1,9 +1,9 @@ using System; -using System.Drawing; +using CoreGraphics; -using MonoTouch.Foundation; -using MonoTouch.UIKit; +using Foundation; +using UIKit; namespace AnimationSamples { diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/DemoViewTransition.designer.cs b/EvolveGraphicsAndAnimation/AnimationSamples/DemoViewTransition.designer.cs index 0ed9caf8..ab8e5e05 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/DemoViewTransition.designer.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/DemoViewTransition.designer.cs @@ -4,7 +4,7 @@ // actions made in the Xcode designer. If it is removed, they will be lost. // Manual changes to this file may not be handled correctly. // -using MonoTouch.Foundation; +using Foundation; namespace AnimationSamples { diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/ExplicitLayerAnimation.cs b/EvolveGraphicsAndAnimation/AnimationSamples/ExplicitLayerAnimation.cs index 20b3d774..cdcf7ab7 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/ExplicitLayerAnimation.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/ExplicitLayerAnimation.cs @@ -1,11 +1,11 @@ using System; -using System.Drawing; +using CoreGraphics; + +using Foundation; +using UIKit; +using CoreAnimation; -using MonoTouch.Foundation; -using MonoTouch.UIKit; -using MonoTouch.CoreAnimation; -using MonoTouch.CoreGraphics; namespace AnimationSamples { @@ -23,8 +23,8 @@ namespace AnimationSamples base.ViewDidLoad (); layer = new CALayer (); - layer.Bounds = new RectangleF (0, 0, 50, 50); - layer.Position = new PointF (50, 50); + layer.Bounds = new CGRect (0, 0, 50, 50); + layer.Position = new CGPoint (50, 50); layer.Contents = UIImage.FromFile ("monkey2.png").CGImage; layer.ContentsGravity = CALayer.GravityResize; layer.BorderWidth = 1.5f; @@ -38,16 +38,16 @@ namespace AnimationSamples base.ViewDidAppear (animated); // get the initial value to start the animation from - PointF fromPt = layer.Position; + CGPoint fromPt = layer.Position; // set the position to coincide with the final animation value // to prevent it from snapping back to the starting position // after the animation completes - layer.Position = new PointF (200, 300); + layer.Position = new CGPoint (200, 300); // create a path for the animation to follow CGPath path = new CGPath (); - path.AddLines (new PointF[] { fromPt, new PointF (50, 300), new PointF (200, 50), new PointF (200, 300) }); + path.AddLines (new CGPoint[] { fromPt, new CGPoint (50, 300), new CGPoint (200, 50), new CGPoint (200, 300) }); // create a keyframe animation for the position using the path CAKeyFrameAnimation animPosition = (CAKeyFrameAnimation)CAKeyFrameAnimation.FromKeyPath ("position"); diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/ExplicitLayerAnimation.designer.cs b/EvolveGraphicsAndAnimation/AnimationSamples/ExplicitLayerAnimation.designer.cs index 480d0839..f80b4022 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/ExplicitLayerAnimation.designer.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/ExplicitLayerAnimation.designer.cs @@ -4,7 +4,7 @@ // actions made in the Xcode designer. If it is removed, they will be lost. // Manual changes to this file may not be handled correctly. // -using MonoTouch.Foundation; +using Foundation; namespace AnimationSamples { diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/ImplicitLayerAnimation.cs b/EvolveGraphicsAndAnimation/AnimationSamples/ImplicitLayerAnimation.cs index b4a55bb4..eafe3ffb 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/ImplicitLayerAnimation.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/ImplicitLayerAnimation.cs @@ -1,10 +1,10 @@ using System; -using System.Drawing; +using CoreGraphics; -using MonoTouch.Foundation; -using MonoTouch.UIKit; -using MonoTouch.CoreAnimation; +using Foundation; +using UIKit; +using CoreAnimation; namespace AnimationSamples { @@ -21,8 +21,8 @@ namespace AnimationSamples base.ViewDidLoad (); layer = new CALayer (); - layer.Bounds = new RectangleF (0, 0, 50, 50); - layer.Position = new PointF (50, 50); + layer.Bounds = new CGRect (0, 0, 50, 50); + layer.Position = new CGPoint (50, 50); layer.Contents = UIImage.FromFile ("monkey2.png").CGImage; layer.ContentsGravity = CALayer.GravityResize; layer.BorderWidth = 1.5f; @@ -37,7 +37,7 @@ namespace AnimationSamples CATransaction.Begin (); CATransaction.AnimationDuration = 10; - layer.Position = new PointF (50, 400); + layer.Position = new CGPoint (50, 400); layer.BorderWidth = 5.0f; layer.BorderColor = UIColor.Red.CGColor; CATransaction.Commit (); diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/ImplicitLayerAnimation.designer.cs b/EvolveGraphicsAndAnimation/AnimationSamples/ImplicitLayerAnimation.designer.cs index 7320a255..0cf341ad 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/ImplicitLayerAnimation.designer.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/ImplicitLayerAnimation.designer.cs @@ -4,7 +4,7 @@ // actions made in the Xcode designer. If it is removed, they will be lost. // Manual changes to this file may not be handled correctly. // -using MonoTouch.Foundation; +using Foundation; namespace AnimationSamples { diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/Main.cs b/EvolveGraphicsAndAnimation/AnimationSamples/Main.cs index bfcf3770..9017573c 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/Main.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/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 AnimationSamples { diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/SecondViewController.cs b/EvolveGraphicsAndAnimation/AnimationSamples/SecondViewController.cs index 9425706d..b050fbeb 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/SecondViewController.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/SecondViewController.cs @@ -1,9 +1,9 @@ using System; -using System.Drawing; +using CoreGraphics; -using MonoTouch.Foundation; -using MonoTouch.UIKit; +using Foundation; +using UIKit; namespace AnimationSamples { diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/SecondViewController.designer.cs b/EvolveGraphicsAndAnimation/AnimationSamples/SecondViewController.designer.cs index 31e03e23..f9ba55d7 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/SecondViewController.designer.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/SecondViewController.designer.cs @@ -4,7 +4,7 @@ // actions made in the Xcode designer. If it is removed, they will be lost. // Manual changes to this file may not be handled correctly. // -using MonoTouch.Foundation; +using Foundation; namespace AnimationSamples { diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/ViewAnimation.cs b/EvolveGraphicsAndAnimation/AnimationSamples/ViewAnimation.cs index 02186ffb..df34dde7 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/ViewAnimation.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/ViewAnimation.cs @@ -1,17 +1,17 @@ using System; -using System.Drawing; +using CoreGraphics; -using MonoTouch.Foundation; -using MonoTouch.UIKit; -using MonoTouch.CoreGraphics; -using MonoTouch.CoreAnimation; +using Foundation; +using UIKit; + +using CoreAnimation; namespace AnimationSamples { public partial class ViewAnimation : UIViewController { - PointF pt; + CGPoint pt; UIImageView imgView; UIImage img; @@ -23,7 +23,7 @@ namespace AnimationSamples { base.ViewDidLoad (); - imgView = new UIImageView (new RectangleF (0, 0, 100, 100)); + imgView = new UIImageView (new CGRect (0, 0, 100, 100)); imgView.ContentMode = UIViewContentMode.ScaleAspectFit; img = UIImage.FromFile ("monkey3.png"); imgView.Image = img; @@ -36,7 +36,7 @@ namespace AnimationSamples delay: 0, options: UIViewAnimationOptions.CurveEaseInOut | UIViewAnimationOptions.Autoreverse, animation: () => { - imgView.Center = new PointF (View.Bounds.GetMaxX () - imgView.Frame.Width / 2, pt.Y);}, + imgView.Center = new CGPoint (View.Bounds.GetMaxX () - imgView.Frame.Width / 2, pt.Y);}, completion: () => { imgView.Center = pt; } ); diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/ViewAnimation.designer.cs b/EvolveGraphicsAndAnimation/AnimationSamples/ViewAnimation.designer.cs index 84d4b255..752ca1f1 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/ViewAnimation.designer.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/ViewAnimation.designer.cs @@ -4,7 +4,7 @@ // actions made in the Xcode designer. If it is removed, they will be lost. // Manual changes to this file may not be handled correctly. // -using MonoTouch.Foundation; +using Foundation; namespace AnimationSamples { diff --git a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/AppDelegate.cs b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/AppDelegate.cs index 22e65ab6..4263c768 100644 --- a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/AppDelegate.cs +++ b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/AppDelegate.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using MonoTouch.Foundation; -using MonoTouch.UIKit; +using Foundation; +using UIKit; namespace CoreGraphicsSamples { diff --git a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/CoreGraphicsSamples.csproj b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/CoreGraphicsSamples.csproj index 7ccd8861..78ef8485 100644 --- a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/CoreGraphicsSamples.csproj +++ b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/CoreGraphicsSamples.csproj @@ -16,7 +16,7 @@ full False bin\iPhoneSimulator\Debug - DEBUG; + DEBUG;XAMCORE_2_0;ARCH_64 prompt 4 False @@ -25,6 +25,7 @@ ARMv7 + --registrar:static --nofastsim --override-abi x86_64 none @@ -65,7 +66,9 @@ - + + \Developer\MonoTouch\usr\lib\mono\Xamarin.iOS\Xamarin.iOS.dll + @@ -86,4 +89,4 @@ - \ No newline at end of file + diff --git a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/CoreGraphicsSamplesViewController.cs b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/CoreGraphicsSamplesViewController.cs index 7b8fdb0c..6cbf1dd5 100644 --- a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/CoreGraphicsSamplesViewController.cs +++ b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/CoreGraphicsSamplesViewController.cs @@ -1,7 +1,7 @@ -using MonoTouch.UIKit; -using System.Drawing; +using UIKit; +using CoreGraphics; using System; -using MonoTouch.Foundation; +using Foundation; namespace CoreGraphicsSamples { diff --git a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/DrawnImageView.cs b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/DrawnImageView.cs index 9ddc1736..fccaa0ae 100644 --- a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/DrawnImageView.cs +++ b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/DrawnImageView.cs @@ -1,7 +1,7 @@ using System; -using MonoTouch.UIKit; -using MonoTouch.CoreGraphics; -using System.Drawing; +using UIKit; + +using CoreGraphics; namespace CoreGraphicsSamples { @@ -12,7 +12,7 @@ namespace CoreGraphicsSamples BackgroundColor = UIColor.White; } - public override void Draw (RectangleF rect) + public override void Draw (CGRect rect) { base.Draw (rect); @@ -27,7 +27,7 @@ namespace CoreGraphicsSamples g.SetLineWidth (2.0f); g.SetStrokeColor (UIColor.Green.CGColor); g.SetFillColor (UIColor.Purple.CGColor); - g.SetShadowWithColor (new SizeF (5, 5), 0, UIColor.Blue.CGColor); + g.SetShadow (new CGSize (5, 5), 0, UIColor.Blue.CGColor); g.SetTextDrawingMode (CGTextDrawingMode.FillStroke); g.SelectFont ("Helvetica", fontSize, CGTextEncoding.MacRoman); diff --git a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/Main.cs b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/Main.cs index 1f7f5619..f602ef6b 100644 --- a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/Main.cs +++ b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/Main.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using MonoTouch.Foundation; -using MonoTouch.UIKit; +using Foundation; +using UIKit; namespace CoreGraphicsSamples { diff --git a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/PDFView.cs b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/PDFView.cs index f5bdd54c..183a07dd 100644 --- a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/PDFView.cs +++ b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/PDFView.cs @@ -1,8 +1,8 @@ using System; -using MonoTouch.UIKit; -using MonoTouch.CoreGraphics; -using System.Drawing; -using MonoTouch.Foundation; +using UIKit; + +using CoreGraphics; +using Foundation; namespace CoreGraphicsSamples { @@ -18,7 +18,7 @@ namespace CoreGraphicsSamples pdfDoc = CGPDFDocument.FromFile ("file.pdf"); } - public override void Draw (RectangleF rect) + public override void Draw (CGRect rect) { base.Draw (rect); @@ -45,7 +45,7 @@ namespace CoreGraphicsSamples //data buffer to hold the PDF NSMutableData data = new NSMutableData (); //create a PDF with empty rectangle, which will configure it for 8.5x11 inches - UIGraphics.BeginPDFContext (data, RectangleF.Empty, null); + UIGraphics.BeginPDFContext (data, CGRect.Empty, null); //start a PDF page UIGraphics.BeginPDFPage (); using (CGContext g = UIGraphics.GetCurrentContext ()) { diff --git a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/TriangleView.cs b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/TriangleView.cs index faf8354b..6ff08f76 100644 --- a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/TriangleView.cs +++ b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/TriangleView.cs @@ -1,7 +1,7 @@ using System; -using MonoTouch.CoreGraphics; -using System.Drawing; -using MonoTouch.UIKit; + +using CoreGraphics; +using UIKit; namespace CoreGraphicsSamples { @@ -12,7 +12,7 @@ namespace CoreGraphicsSamples BackgroundColor = UIColor.White; } - public override void Draw (RectangleF rect) + public override void Draw (CGRect rect) { base.Draw (rect); @@ -27,15 +27,15 @@ namespace CoreGraphicsSamples //create geometry var path = new CGPath (); - path.AddLines (new PointF[]{ - new PointF (100, 200), - new PointF (160, 100), - new PointF (220, 200)}); + path.AddLines (new CGPoint[]{ + new CGPoint (100, 200), + new CGPoint (160, 100), + new CGPoint (220, 200)}); path.CloseSubpath (); //use a dashed line - g.SetLineDash (0, new float[]{10, 4}); + g.SetLineDash (0, new nfloat[]{10, 4}); //add geometry to graphics context and draw it g.AddPath (path); @@ -56,8 +56,8 @@ namespace CoreGraphicsSamples // draw a linear gradient g.DrawLinearGradient ( gradient, - new PointF (path.BoundingBox.Left, path.BoundingBox.Top), - new PointF (path.BoundingBox.Right, path.BoundingBox.Bottom), + new CGPoint (path.BoundingBox.Left, path.BoundingBox.Top), + new CGPoint (path.BoundingBox.Right, path.BoundingBox.Bottom), CGGradientDrawingOptions.DrawsBeforeStartLocation); } } diff --git a/EvolveGraphicsAndAnimation/GraphicsDemo/AppDelegate.cs b/EvolveGraphicsAndAnimation/GraphicsDemo/AppDelegate.cs index a2ea081d..d4762c7e 100644 --- a/EvolveGraphicsAndAnimation/GraphicsDemo/AppDelegate.cs +++ b/EvolveGraphicsAndAnimation/GraphicsDemo/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 GraphicsDemo { diff --git a/EvolveGraphicsAndAnimation/GraphicsDemo/DemoView.cs b/EvolveGraphicsAndAnimation/GraphicsDemo/DemoView.cs index 2039a10a..5b5978ad 100644 --- a/EvolveGraphicsAndAnimation/GraphicsDemo/DemoView.cs +++ b/EvolveGraphicsAndAnimation/GraphicsDemo/DemoView.cs @@ -1,16 +1,16 @@ using System; -using MonoTouch.UIKit; -using MonoTouch.CoreGraphics; -using System.Drawing; -using MonoTouch.CoreAnimation; +using UIKit; + +using CoreGraphics; +using CoreAnimation; namespace GraphicsDemo { public class DemoView : UIView { CGPath path; - PointF initialPoint; - PointF latestPoint; + CGPoint initialPoint; + CGPoint latestPoint; CALayer layer; @@ -22,8 +22,8 @@ namespace GraphicsDemo //create layer layer = new CALayer (); - layer.Bounds = new RectangleF (0, 0, 50, 50); - layer.Position = new PointF (50, 50); + layer.Bounds = new CGRect (0, 0, 50, 50); + layer.Position = new CGPoint (50, 50); layer.Contents = UIImage.FromFile ("monkey.png").CGImage; layer.ContentsGravity = CALayer.GravityResizeAspect; layer.BorderWidth = 1.5f; @@ -32,7 +32,7 @@ namespace GraphicsDemo layer.BackgroundColor = UIColor.Purple.CGColor; } - public override void TouchesBegan (MonoTouch.Foundation.NSSet touches, UIEvent evt) + public override void TouchesBegan (Foundation.NSSet touches, UIEvent evt) { base.TouchesBegan (touches, evt); @@ -43,7 +43,7 @@ namespace GraphicsDemo } } - public override void TouchesMoved (MonoTouch.Foundation.NSSet touches, UIEvent evt) + public override void TouchesMoved (Foundation.NSSet touches, UIEvent evt) { base.TouchesMoved (touches, evt); @@ -55,7 +55,7 @@ namespace GraphicsDemo } } - public override void TouchesEnded (MonoTouch.Foundation.NSSet touches, UIEvent evt) + public override void TouchesEnded (Foundation.NSSet touches, UIEvent evt) { base.TouchesEnded (touches, evt); @@ -72,7 +72,7 @@ namespace GraphicsDemo layer.AddAnimation (animPosition, "position"); } - public override void Draw (RectangleF rect) + public override void Draw (CGRect rect) { base.Draw (rect); @@ -87,13 +87,13 @@ namespace GraphicsDemo //add lines to the touch points if (path.IsEmpty) { - path.AddLines (new PointF[]{initialPoint, latestPoint}); + path.AddLines (new CGPoint[]{initialPoint, latestPoint}); } else { path.AddLineToPoint (latestPoint); } //use a dashed line - g.SetLineDash (0, new float[]{5, 2}); + g.SetLineDash (0, new nfloat[]{5, 2}); //add geometry to graphics context and draw it g.AddPath (path); diff --git a/EvolveGraphicsAndAnimation/GraphicsDemo/GraphicsDemo.csproj b/EvolveGraphicsAndAnimation/GraphicsDemo/GraphicsDemo.csproj index 7c92a159..f46b1d99 100644 --- a/EvolveGraphicsAndAnimation/GraphicsDemo/GraphicsDemo.csproj +++ b/EvolveGraphicsAndAnimation/GraphicsDemo/GraphicsDemo.csproj @@ -17,12 +17,13 @@ full False bin\iPhoneSimulator\Debug - DEBUG; + DEBUG;XAMCORE_2_0;ARCH_64 prompt 4 False None True + --registrar:static --nofastsim --override-abi x86_64 none @@ -84,7 +85,9 @@ - + + \Developer\MonoTouch\usr\lib\mono\Xamarin.iOS\Xamarin.iOS.dll + @@ -111,4 +114,4 @@ - \ No newline at end of file + diff --git a/EvolveGraphicsAndAnimation/GraphicsDemo/GraphicsDemoViewController.cs b/EvolveGraphicsAndAnimation/GraphicsDemo/GraphicsDemoViewController.cs index 7f0d1e48..25bf9745 100644 --- a/EvolveGraphicsAndAnimation/GraphicsDemo/GraphicsDemoViewController.cs +++ b/EvolveGraphicsAndAnimation/GraphicsDemo/GraphicsDemoViewController.cs @@ -1,8 +1,8 @@ using System; -using System.Drawing; +using CoreGraphics; -using MonoTouch.Foundation; -using MonoTouch.UIKit; +using Foundation; +using UIKit; namespace GraphicsDemo { diff --git a/EvolveGraphicsAndAnimation/GraphicsDemo/Main.cs b/EvolveGraphicsAndAnimation/GraphicsDemo/Main.cs index 65644517..c32b2f22 100644 --- a/EvolveGraphicsAndAnimation/GraphicsDemo/Main.cs +++ b/EvolveGraphicsAndAnimation/GraphicsDemo/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 GraphicsDemo {