diff --git a/CoreTelephonyDemo/Info.plist b/CoreTelephonyDemo/Info.plist index bc3c9fea..fc731ae7 100644 --- a/CoreTelephonyDemo/Info.plist +++ b/CoreTelephonyDemo/Info.plist @@ -38,5 +38,12 @@ MinimumOSVersion 5.1.1 + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + diff --git a/CustomCollectionViewLayoutAttributes/SimpleCollectionViewController.cs b/CustomCollectionViewLayoutAttributes/SimpleCollectionViewController.cs index a33016e3..598cc864 100644 --- a/CustomCollectionViewLayoutAttributes/SimpleCollectionViewController.cs +++ b/CustomCollectionViewLayoutAttributes/SimpleCollectionViewController.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using CoreGraphics; using UIKit; using Foundation; diff --git a/CustomPropertyAnimation/AppDelegate.cs b/CustomPropertyAnimation/AppDelegate.cs index 0e1ac853..ff2f68d8 100644 --- a/CustomPropertyAnimation/AppDelegate.cs +++ b/CustomPropertyAnimation/AppDelegate.cs @@ -1,5 +1,4 @@ using System; -using CoreGraphics; using CoreAnimation; using CoreGraphics; diff --git a/Drawing/Screens/iPad/ColorPattern/Controller.cs b/Drawing/Screens/iPad/ColorPattern/Controller.cs index 28cb5d99..e2b5ea6c 100644 --- a/Drawing/Screens/iPad/ColorPattern/Controller.cs +++ b/Drawing/Screens/iPad/ColorPattern/Controller.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; namespace Example_Drawing.Screens.iPad.ColorPattern { diff --git a/Drawing/Screens/iPad/CoordinatesOffScreen/Controller.cs b/Drawing/Screens/iPad/CoordinatesOffScreen/Controller.cs index 0f1b9cf5..13574e4d 100644 --- a/Drawing/Screens/iPad/CoordinatesOffScreen/Controller.cs +++ b/Drawing/Screens/iPad/CoordinatesOffScreen/Controller.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; namespace Example_Drawing.Screens.iPad.CoordinatesOffScreen { diff --git a/Drawing/Screens/iPad/CoordinatesOnScreen/View.cs b/Drawing/Screens/iPad/CoordinatesOnScreen/View.cs index d41aa65c..8f5119e8 100644 --- a/Drawing/Screens/iPad/CoordinatesOnScreen/View.cs +++ b/Drawing/Screens/iPad/CoordinatesOnScreen/View.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; namespace Example_Drawing.Screens.iPad.CoordinatesOnScreen { diff --git a/Drawing/Screens/iPad/DrawOffScreenUsingCGBitmapContext/Controller.cs b/Drawing/Screens/iPad/DrawOffScreenUsingCGBitmapContext/Controller.cs index 75ac9e15..372fc32e 100644 --- a/Drawing/Screens/iPad/DrawOffScreenUsingCGBitmapContext/Controller.cs +++ b/Drawing/Screens/iPad/DrawOffScreenUsingCGBitmapContext/Controller.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; namespace Example_Drawing.Screens.iPad.DrawOffScreenUsingCGBitmapContext { diff --git a/Drawing/Screens/iPad/DrawRectVsPath/View.cs b/Drawing/Screens/iPad/DrawRectVsPath/View.cs index 59497670..e7f5d98f 100644 --- a/Drawing/Screens/iPad/DrawRectVsPath/View.cs +++ b/Drawing/Screens/iPad/DrawRectVsPath/View.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; namespace Example_Drawing.Screens.iPad.DrawRectVsPath { diff --git a/Drawing/Screens/iPad/FlagOffScreen/Controller.cs b/Drawing/Screens/iPad/FlagOffScreen/Controller.cs index 2582cb1e..5067ff88 100644 --- a/Drawing/Screens/iPad/FlagOffScreen/Controller.cs +++ b/Drawing/Screens/iPad/FlagOffScreen/Controller.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; namespace Example_Drawing.Screens.iPad.FlagOffScreen { diff --git a/Drawing/Screens/iPad/FlagOnScreen/View.cs b/Drawing/Screens/iPad/FlagOnScreen/View.cs index 3096ba5e..5b4e1f51 100644 --- a/Drawing/Screens/iPad/FlagOnScreen/View.cs +++ b/Drawing/Screens/iPad/FlagOnScreen/View.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; namespace Example_Drawing.Screens.iPad.FlagOnScreen { diff --git a/Drawing/Screens/iPad/HitTesting/View.cs b/Drawing/Screens/iPad/HitTesting/View.cs index 1b5d6d67..7ee82263 100644 --- a/Drawing/Screens/iPad/HitTesting/View.cs +++ b/Drawing/Screens/iPad/HitTesting/View.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; using Foundation; namespace Example_Drawing.Screens.iPad.HitTesting diff --git a/Drawing/Screens/iPad/Images/Controller.cs b/Drawing/Screens/iPad/Images/Controller.cs index b111b3bf..4b60eb5f 100644 --- a/Drawing/Screens/iPad/Images/Controller.cs +++ b/Drawing/Screens/iPad/Images/Controller.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; namespace Example_Drawing.Screens.iPad.Images { diff --git a/Drawing/Screens/iPad/Layers/View.cs b/Drawing/Screens/iPad/Layers/View.cs index f1d73bea..4eabc203 100644 --- a/Drawing/Screens/iPad/Layers/View.cs +++ b/Drawing/Screens/iPad/Layers/View.cs @@ -1,6 +1,5 @@ using System; using CoreGraphics; -using CoreGraphics; using UIKit; namespace Example_Drawing.Screens.iPad.Layers diff --git a/Drawing/Screens/iPad/OnScreenUncorrectedTextRotation/View.cs b/Drawing/Screens/iPad/OnScreenUncorrectedTextRotation/View.cs index dcf06181..0bf888ab 100644 --- a/Drawing/Screens/iPad/OnScreenUncorrectedTextRotation/View.cs +++ b/Drawing/Screens/iPad/OnScreenUncorrectedTextRotation/View.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; namespace Example_Drawing.Screens.iPad.OnScreenUncorrectedTextRotation { diff --git a/Drawing/Screens/iPad/Shadows/Controller.cs b/Drawing/Screens/iPad/Shadows/Controller.cs index 43407dcc..324d37f1 100644 --- a/Drawing/Screens/iPad/Shadows/Controller.cs +++ b/Drawing/Screens/iPad/Shadows/Controller.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; namespace Example_Drawing.Screens.iPad.Shadows { diff --git a/Drawing/Screens/iPad/StencilPattern/Controller.cs b/Drawing/Screens/iPad/StencilPattern/Controller.cs index 1d8696bf..14175351 100644 --- a/Drawing/Screens/iPad/StencilPattern/Controller.cs +++ b/Drawing/Screens/iPad/StencilPattern/Controller.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; namespace Example_Drawing.Screens.iPad.StencilPattern { diff --git a/Drawing/Screens/iPad/TouchDrawing/View.cs b/Drawing/Screens/iPad/TouchDrawing/View.cs index 85dc1528..5a61f7bb 100644 --- a/Drawing/Screens/iPad/TouchDrawing/View.cs +++ b/Drawing/Screens/iPad/TouchDrawing/View.cs @@ -1,6 +1,5 @@ using System; using CoreGraphics; -using CoreGraphics; using UIKit; using System.Collections.Generic; using Foundation; diff --git a/Drawing/Screens/iPad/Transformations/Controller.cs b/Drawing/Screens/iPad/Transformations/Controller.cs index 2b3ec558..92cc79f5 100644 --- a/Drawing/Screens/iPad/Transformations/Controller.cs +++ b/Drawing/Screens/iPad/Transformations/Controller.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; namespace Example_Drawing.Screens.iPad.Transformations { diff --git a/DynamicsCatalog/Dynamics_Catalog/AttachmentsViewController.cs b/DynamicsCatalog/Dynamics_Catalog/AttachmentsViewController.cs index 659910c8..431c48ee 100644 --- a/DynamicsCatalog/Dynamics_Catalog/AttachmentsViewController.cs +++ b/DynamicsCatalog/Dynamics_Catalog/AttachmentsViewController.cs @@ -16,10 +16,6 @@ namespace DynamicsCatalog { { base.ViewDidLoad (); - var collisionBehavior = new UICollisionBehavior (square) { - TranslatesReferenceBoundsIntoBoundary = true - }; - var squareCenterPoint = new CGPoint (square.Center.X, square.Center.Y - 100.0f); var attachmentOffset = new UIOffset (-25.0f, -25.0f); diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/ExplicitLayerAnimation.cs b/EvolveGraphicsAndAnimation/AnimationSamples/ExplicitLayerAnimation.cs index 2f6a9178..90fa69a7 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/ExplicitLayerAnimation.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/ExplicitLayerAnimation.cs @@ -1,6 +1,4 @@ - using System; -using CoreGraphics; using Foundation; using UIKit; diff --git a/EvolveGraphicsAndAnimation/AnimationSamples/ViewAnimation.cs b/EvolveGraphicsAndAnimation/AnimationSamples/ViewAnimation.cs index 78b7690d..f027ed3b 100644 --- a/EvolveGraphicsAndAnimation/AnimationSamples/ViewAnimation.cs +++ b/EvolveGraphicsAndAnimation/AnimationSamples/ViewAnimation.cs @@ -1,6 +1,4 @@ - using System; -using CoreGraphics; using Foundation; using UIKit; diff --git a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/DrawnImageView.cs b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/DrawnImageView.cs index 0782f5cd..4cdf494e 100644 --- a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/DrawnImageView.cs +++ b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/DrawnImageView.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; namespace CoreGraphicsSamples { diff --git a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/PDFView.cs b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/PDFView.cs index d76abcf8..55e62c19 100644 --- a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/PDFView.cs +++ b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/PDFView.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; using Foundation; namespace CoreGraphicsSamples diff --git a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/TriangleView.cs b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/TriangleView.cs index 28c652d7..3d8cf539 100644 --- a/EvolveGraphicsAndAnimation/CoreGraphicsSamples/TriangleView.cs +++ b/EvolveGraphicsAndAnimation/CoreGraphicsSamples/TriangleView.cs @@ -1,6 +1,5 @@ using System; using CoreGraphics; -using CoreGraphics; using UIKit; namespace CoreGraphicsSamples diff --git a/EvolveGraphicsAndAnimation/GraphicsDemo/DemoView.cs b/EvolveGraphicsAndAnimation/GraphicsDemo/DemoView.cs index 9306e0a1..6e7e1dd3 100644 --- a/EvolveGraphicsAndAnimation/GraphicsDemo/DemoView.cs +++ b/EvolveGraphicsAndAnimation/GraphicsDemo/DemoView.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; using CoreAnimation; namespace GraphicsDemo diff --git a/FileSystemSampleCode/FileSystem/FileSystem.csproj b/FileSystemSampleCode/FileSystem/FileSystem.csproj index a0bab1a2..f081687b 100644 --- a/FileSystemSampleCode/FileSystem/FileSystem.csproj +++ b/FileSystemSampleCode/FileSystem/FileSystem.csproj @@ -27,6 +27,7 @@ i386 + true none diff --git a/FileSystemSampleCode/FileSystem/Info.plist b/FileSystemSampleCode/FileSystem/Info.plist index f1ffda77..6e12a70e 100644 --- a/FileSystemSampleCode/FileSystem/Info.plist +++ b/FileSystemSampleCode/FileSystem/Info.plist @@ -41,6 +41,11 @@ MinimumOSVersion 5.1.1 UISupportedInterfaceOrientations~ipad - + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + diff --git a/GLCameraRipple/Entitlements.plist b/GLCameraRipple/Entitlements.plist new file mode 100644 index 00000000..6fe7bb95 --- /dev/null +++ b/GLCameraRipple/Entitlements.plist @@ -0,0 +1,6 @@ + + + + + + diff --git a/GLCameraRipple/GLCameraRipple.csproj b/GLCameraRipple/GLCameraRipple.csproj index 1c0f3e69..440d5f84 100644 --- a/GLCameraRipple/GLCameraRipple.csproj +++ b/GLCameraRipple/GLCameraRipple.csproj @@ -3,7 +3,7 @@ Debug iPhoneSimulator - 10.0.0 + 8.0.30703 2.0 {96FCF082-6930-4167-BDEF-07ABB007205A} {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -50,11 +50,16 @@ prompt 4 False - iPhone Developer + iPhone Developer: Aaron Sky (PV46JWMLS9) True True True ARMv7 + true + + + Entitlements.plist + 57606011-fe4c-4347-bd07-f0c97cbbe7f4 none @@ -66,6 +71,7 @@ iPhone Developer True ARMv7, ARM64 + Entitlements.plist @@ -76,6 +82,7 @@ + diff --git a/GLCameraRipple/Info.plist b/GLCameraRipple/Info.plist index 568e533b..81bf60f9 100644 --- a/GLCameraRipple/Info.plist +++ b/GLCameraRipple/Info.plist @@ -21,5 +21,15 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + CFBundleIdentifier + com.xamarin.GLCameraRipple + CFBundleDisplayName + GLCameraRipple + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1.0 + MinimumOSVersion + 7.0 diff --git a/GLCameraRipple/Ripple.cs b/GLCameraRipple/Ripple.cs index e21ff758..92278cc7 100644 --- a/GLCameraRipple/Ripple.cs +++ b/GLCameraRipple/Ripple.cs @@ -9,7 +9,7 @@ namespace GLCameraRipple { CGSize screenSize; int poolHeight, poolWidth; - int touchRadius, meshFactor; + int touchRadius; float texCoordFactorS; float texCoordOffsetS; @@ -32,7 +32,6 @@ namespace GLCameraRipple { Console.WriteLine ("New RippleModel"); this.screenSize = screenSize; - this.meshFactor = meshFactor; this.touchRadius = touchRadius; poolWidth = (int)screenSize.Width/meshFactor; poolHeight =(int) screenSize.Height/meshFactor; diff --git a/GLCameraRipple/RippleViewController.cs b/GLCameraRipple/RippleViewController.cs index 0c4c93e8..0561c563 100644 --- a/GLCameraRipple/RippleViewController.cs +++ b/GLCameraRipple/RippleViewController.cs @@ -47,7 +47,7 @@ namespace GLCameraRipple glkView.DrawInRect += Draw; PreferredFramesPerSecond = 60; - size = UIScreen.MainScreen.Bounds.Size.ToSize (); + size = UIScreen.MainScreen.Bounds.Size.ToRoundedCGSize (); View.ContentScaleFactor = UIScreen.MainScreen.Scale; meshFactor = isPad ? 8 : 4; @@ -62,9 +62,9 @@ namespace GLCameraRipple void Draw (object sender, GLKViewDrawEventArgs args) { - GL.Clear ((int)All.ColorBufferBit); + GL.Clear (ClearBufferMask.ColorBufferBit); if (ripple != null) - GL.DrawElements (All.TriangleStrip, ripple.IndexCount, All.UnsignedShort, IntPtr.Zero); + GL.DrawElements (BeginMode.TriangleStrip, ripple.IndexCount, DrawElementsType.UnsignedShort, IntPtr.Zero); } void ProcessTouches (NSSet touches) @@ -179,8 +179,8 @@ namespace GLCameraRipple int vertShader, fragShader; program = GL.CreateProgram (); - if (CompileShader (out vertShader, All.VertexShader, "Shaders/Shader.vsh")){ - if (CompileShader (out fragShader, All.FragmentShader, "Shaders/Shader.fsh")){ + if (CompileShader (out vertShader, ShaderType.VertexShader, "Shaders/Shader.vsh")){ + if (CompileShader (out fragShader, ShaderType.FragmentShader, "Shaders/Shader.fsh")){ // Attach shaders GL.AttachShader (program, vertShader); GL.AttachShader (program, fragShader); @@ -212,7 +212,7 @@ namespace GLCameraRipple return false; } - bool CompileShader (out int shader, All type, string path) + bool CompileShader (out int shader, ShaderType type, string path) { string shaderProgram = System.IO.File.ReadAllText (path); int len = shaderProgram.Length, status = 0; @@ -220,7 +220,7 @@ namespace GLCameraRipple GL.ShaderSource (shader, 1, new string [] { shaderProgram }, ref len); GL.CompileShader (shader); - GL.GetShader (shader, All.CompileStatus, ref status); + GL.GetShader (shader, ShaderParameter.CompileStatus, out status); if (status == 0){ GL.DeleteShader (shader); return false; @@ -304,7 +304,7 @@ namespace GLCameraRipple CleanupTextures (); // Y-plane - GL.ActiveTexture (All.Texture0); + GL.ActiveTexture(TextureUnit.Texture0); All re = (All) 0x1903; // GL_RED_EXT, RED component from ARB OpenGL extension CVReturn status; lumaTexture = container.videoTextureCache.TextureFromImage (pixelBuffer, true, re, textureWidth, textureHeight, re, DataType.UnsignedByte, 0, out status); @@ -313,12 +313,12 @@ namespace GLCameraRipple Console.WriteLine ("Error creating luma texture: {0}", status); return; } - GL.BindTexture ((All)lumaTexture.Target, lumaTexture.Name); - GL.TexParameter (All.Texture2D, All.TextureWrapS, (int) All.ClampToEdge); - GL.TexParameter (All.Texture2D, All.TextureWrapT, (int) All.ClampToEdge); + GL.BindTexture (lumaTexture.Target, lumaTexture.Name); + GL.TexParameter (TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int) All.ClampToEdge); + GL.TexParameter (TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int) All.ClampToEdge); // UV Plane - GL.ActiveTexture (All.Texture1); + GL.ActiveTexture (TextureUnit.Texture1); re = (All) 0x8227; // GL_RG_EXT, RED GREEN component from ARB OpenGL extension chromaTexture = container.videoTextureCache.TextureFromImage (pixelBuffer, true, re, textureWidth/2, textureHeight/2, re, DataType.UnsignedByte, 1, out status); @@ -326,9 +326,9 @@ namespace GLCameraRipple Console.WriteLine ("Error creating chroma texture: {0}", status); return; } - GL.BindTexture ((All) chromaTexture.Target, chromaTexture.Name); - GL.TexParameter (All.Texture2D, All.TextureWrapS, (int)All.ClampToEdge); - GL.TexParameter (All.Texture2D, All.TextureWrapT, (int) All.ClampToEdge); + GL.BindTexture (chromaTexture.Target, chromaTexture.Name); + GL.TexParameter (TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int) All.ClampToEdge); + GL.TexParameter (TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int) All.ClampToEdge); } } finally { sampleBuffer.Dispose (); diff --git a/GLPaint-GameView/GLPaint-GameView.csproj b/GLPaint-GameView/GLPaint-GameView.csproj index eacdf58f..309a8827 100644 --- a/GLPaint-GameView/GLPaint-GameView.csproj +++ b/GLPaint-GameView/GLPaint-GameView.csproj @@ -52,10 +52,10 @@ iPhone Developer False ARMv7, ARM64 - 71febe6c-0ea4-4c1a-bd9d-af13ead83a0e true + true none diff --git a/GLPaint-GameView/Info.plist b/GLPaint-GameView/Info.plist index 2e59659e..dc474ee1 100644 --- a/GLPaint-GameView/Info.plist +++ b/GLPaint-GameView/Info.plist @@ -29,5 +29,20 @@ 1 2 + CFBundleDisplayName + GLPaint-GameView + CFBundleIdentifier + com.xamarin.GLPaintGameView + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1.0 + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + diff --git a/GLPaint-GameView/PaintingView.cs b/GLPaint-GameView/PaintingView.cs index 40b347ef..d777831e 100644 --- a/GLPaint-GameView/PaintingView.cs +++ b/GLPaint-GameView/PaintingView.cs @@ -3,7 +3,7 @@ using OpenTK.Platform.iPhoneOS; using OpenTK.Graphics.ES11; using UIKit; using Foundation; -using CoreGraphics; + using ObjCRuntime; using OpenGLES; using System.Runtime.InteropServices; @@ -20,7 +20,7 @@ namespace GLPaintGameView public const float Luminosity = 0.75f; public const float Saturation = 1.0f; - uint brushTexture, drawingTexture, drawingFramebuffer; + uint brushTexture, drawingTexture; bool firstTouch; CGPoint Location; @@ -90,7 +90,7 @@ namespace GLPaintGameView public void Erase () { - GL.Clear ((uint)All.ColorBufferBit); + GL.Clear (ClearBufferMask.ColorBufferBit); SwapBuffers (); } diff --git a/GameCenterSample/GameCenterSample/AppDelegate.cs b/GameCenterSample/GameCenterSample/AppDelegate.cs index 4bf4704b..6900bf90 100644 --- a/GameCenterSample/GameCenterSample/AppDelegate.cs +++ b/GameCenterSample/GameCenterSample/AppDelegate.cs @@ -16,8 +16,6 @@ namespace GameCenterSample // class-level declarations UIWindow window; MainViewController viewController; - bool gameCenterAuthenticationComplete = false; - string currentPlayerID; // // This method is invoked when the application has loaded and is ready to run. In this diff --git a/GameCenterSample/GameCenterSample/MainViewController.cs b/GameCenterSample/GameCenterSample/MainViewController.cs index f41429b8..655f380c 100644 --- a/GameCenterSample/GameCenterSample/MainViewController.cs +++ b/GameCenterSample/GameCenterSample/MainViewController.cs @@ -89,8 +89,6 @@ namespace GameCenterSample } //Create the achievement we want to submit. - NSString identifier = new NSString ("com.appledts.GameCenterSampleApps.achievement"); - GKAchievement achievement = new GKAchievement ("com.appledts.GameCenterSampleApps.achievement"); achievementsPercentageComplete += 25; diff --git a/HttpClient/Info.plist b/HttpClient/Info.plist index ec758dd5..2801ab35 100644 --- a/HttpClient/Info.plist +++ b/HttpClient/Info.plist @@ -25,5 +25,12 @@ com.xamarin.HttpClient CFBundleDisplayName HttpClient + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + diff --git a/Keychain/Info.plist b/Keychain/Info.plist index 25a7c2c6..ffad31c3 100644 --- a/Keychain/Info.plist +++ b/Keychain/Info.plist @@ -30,5 +30,13 @@ MinimumOSVersion 5.1.1 + CFBundleDisplayName + Keychain + CFBundleIdentifier + com.xamarin.Keychain + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1.0 diff --git a/LazyTableImages/AppDelegate.cs b/LazyTableImages/AppDelegate.cs index 4a27908d..df39157b 100644 --- a/LazyTableImages/AppDelegate.cs +++ b/LazyTableImages/AppDelegate.cs @@ -48,8 +48,6 @@ namespace LazyTableImages { RootViewController RootController { get; set; } - public UIWindow Window { get; set; } - /// /// This method is invoked when the application has loaded and is ready to run. In this /// method you should instantiate the window, load the UI into it and then make the window diff --git a/LazyTableImages/Info.plist b/LazyTableImages/Info.plist index bc67f4f1..f2292f56 100644 --- a/LazyTableImages/Info.plist +++ b/LazyTableImages/Info.plist @@ -25,5 +25,9 @@ 1 + CFBundleDisplayName + LazyTableImages + CFBundleIdentifier + com.xamarin.LazyTableImages diff --git a/LazyTableImagesAsync/AppDelegate.cs b/LazyTableImagesAsync/AppDelegate.cs index 4a27908d..df39157b 100644 --- a/LazyTableImagesAsync/AppDelegate.cs +++ b/LazyTableImagesAsync/AppDelegate.cs @@ -48,8 +48,6 @@ namespace LazyTableImages { RootViewController RootController { get; set; } - public UIWindow Window { get; set; } - /// /// This method is invoked when the application has loaded and is ready to run. In this /// method you should instantiate the window, load the UI into it and then make the window diff --git a/LazyTableImagesAsync/LazyTableImages.csproj b/LazyTableImagesAsync/LazyTableImages.csproj index 39b79a20..284b2552 100644 --- a/LazyTableImagesAsync/LazyTableImages.csproj +++ b/LazyTableImagesAsync/LazyTableImages.csproj @@ -3,7 +3,7 @@ Debug iPhoneSimulator - 10.0.0 + 8.0.30703 2.0 {4D3A8E8A-53D4-4CF5-97D6-9E6199DDB582} {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -24,7 +24,8 @@ False None True - + + i386 diff --git a/LineLayout/LineLayout/Info.plist b/LineLayout/LineLayout/Info.plist index ba5a43de..77cb2f86 100644 --- a/LineLayout/LineLayout/Info.plist +++ b/LineLayout/LineLayout/Info.plist @@ -28,5 +28,13 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + CFBundleDisplayName + LineLayout + CFBundleIdentifier + com.xamarin.LineLayout + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1.0 diff --git a/LineLayout/LineLayout/LineLayout.cs b/LineLayout/LineLayout/LineLayout.cs index a96a107d..00ca522c 100644 --- a/LineLayout/LineLayout/LineLayout.cs +++ b/LineLayout/LineLayout/LineLayout.cs @@ -1,5 +1,4 @@ using System; -using CoreGraphics; using Foundation; using UIKit; using CoreGraphics; diff --git a/LowLevelGLPaint/Info.plist b/LowLevelGLPaint/Info.plist index f44be69e..7e2e16ae 100644 --- a/LowLevelGLPaint/Info.plist +++ b/LowLevelGLPaint/Info.plist @@ -24,5 +24,13 @@ MinimumOSVersion 5.1.1 + CFBundleDisplayName + LowLevelGLPaint + CFBundleIdentifier + com.xamarin.LowLevelGLPaint + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1.0 diff --git a/MTDWalkthrough/Info.plist b/MTDWalkthrough/Info.plist index bc67f4f1..8b711d3d 100644 --- a/MTDWalkthrough/Info.plist +++ b/MTDWalkthrough/Info.plist @@ -25,5 +25,13 @@ 1 + CFBundleDisplayName + MTDWalkthrough + CFBundleIdentifier + com.xamarin.MTDWalkthrough + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1.0 diff --git a/MTDWalkthrough/MTDWalkthrough.csproj b/MTDWalkthrough/MTDWalkthrough.csproj index 5f30130b..d55a488b 100644 --- a/MTDWalkthrough/MTDWalkthrough.csproj +++ b/MTDWalkthrough/MTDWalkthrough.csproj @@ -3,7 +3,7 @@ Debug iPhoneSimulator - 10.0.0 + 8.0.30703 2.0 {668E9122-90F7-4F6A-A9A2-553BE8267165} {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/MapKitSearch/AppDelegate.cs b/MapKitSearch/AppDelegate.cs index 9b8a7588..64813bc7 100644 --- a/MapKitSearch/AppDelegate.cs +++ b/MapKitSearch/AppDelegate.cs @@ -79,7 +79,7 @@ namespace MapKitSearch { response = await search.StartAsync (); } - catch(Exception e){ + catch { return; } if (response == null) diff --git a/MediaCapture/MediaCapture/CaptureManager/CaptureManager.cs b/MediaCapture/MediaCapture/CaptureManager/CaptureManager.cs index 5309cc9c..4ae46079 100644 --- a/MediaCapture/MediaCapture/CaptureManager/CaptureManager.cs +++ b/MediaCapture/MediaCapture/CaptureManager/CaptureManager.cs @@ -19,7 +19,6 @@ using UIKit; using AVFoundation; using CoreVideo; using CoreMedia; -using CoreGraphics; using CoreFoundation; using System.Runtime.InteropServices; diff --git a/MediaCapture/MediaCapture/CaptureManager/MovieSegmentWriterDelegate.cs b/MediaCapture/MediaCapture/CaptureManager/MovieSegmentWriterDelegate.cs index 4727e24f..c2d3dbb6 100644 --- a/MediaCapture/MediaCapture/CaptureManager/MovieSegmentWriterDelegate.cs +++ b/MediaCapture/MediaCapture/CaptureManager/MovieSegmentWriterDelegate.cs @@ -20,7 +20,6 @@ using UIKit; using AVFoundation; using CoreVideo; using CoreMedia; -using CoreGraphics; using CoreFoundation; using System.Runtime.InteropServices; diff --git a/MediaCapture/MediaCapture/CaptureManager/VideoFrameSamplerDelegate.cs b/MediaCapture/MediaCapture/CaptureManager/VideoFrameSamplerDelegate.cs index a0059693..20d4c40d 100644 --- a/MediaCapture/MediaCapture/CaptureManager/VideoFrameSamplerDelegate.cs +++ b/MediaCapture/MediaCapture/CaptureManager/VideoFrameSamplerDelegate.cs @@ -11,7 +11,6 @@ // Enhancements, suggestions and bug reports can be sent to steve.millar@infinitekdev.com // using System; -using CoreGraphics; using Foundation; using UIKit; using AVFoundation; diff --git a/MediaCapture/MediaCapture/Info.plist b/MediaCapture/MediaCapture/Info.plist index fb5e34d3..8de80851 100644 --- a/MediaCapture/MediaCapture/Info.plist +++ b/MediaCapture/MediaCapture/Info.plist @@ -34,5 +34,13 @@ MinimumOSVersion 6.0 + CFBundleDisplayName + MediaCapture + CFBundleIdentifier + com.xamarin.MediaCapture + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1.0 diff --git a/MediaNotes/MediaNotes/PhotoNotes/PhotoViewController.cs b/MediaNotes/MediaNotes/PhotoNotes/PhotoViewController.cs index 1a22401f..81c5417c 100644 --- a/MediaNotes/MediaNotes/PhotoNotes/PhotoViewController.cs +++ b/MediaNotes/MediaNotes/PhotoNotes/PhotoViewController.cs @@ -193,7 +193,6 @@ namespace MediaNotes public void Synchronize (bool initializationSucceeded) { - bool finishedp; if (initializationSucceeded == true) { placeHolderActivityView.StopAnimating (); diff --git a/MediaNotes/MediaNotes/PhotoNotes/PhotoViewController.xib b/MediaNotes/MediaNotes/PhotoNotes/PhotoViewController.xib index e57d5ba2..7799f00d 100644 --- a/MediaNotes/MediaNotes/PhotoNotes/PhotoViewController.xib +++ b/MediaNotes/MediaNotes/PhotoNotes/PhotoViewController.xib @@ -1,14 +1,14 @@ - 1536 - 11E53 - 2829 - 1138.47 - 569.00 + 2048 + 14D136 + 7531 + 1347.57 + 758.70 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1914 + 7520 IBProxyObject @@ -148,9 +148,6 @@ 7 NO IBIPadFramework - - 0 - 0.5 Photo Notes Is Loading 1 @@ -159,17 +156,21 @@ 1 + + 0 + 20 1 1 + 0 40 - Helvetica + HelveticaNeue 40 16 - 1 + YES {{65, 91}, {640, 640}} @@ -193,11 +194,28 @@ 2 + + IBUIScreenMetrics + IBIPadFramework + iPad Full Screen + + YES + + + + + + {768, 1024} + {1024, 768} + + + 1 + IBIPadFramework - + view @@ -401,7 +419,7 @@ UIView IBProjectSource - ./Classes/PNContainerView.h + ../PNContainerView.h @@ -452,13 +470,137 @@ IBProjectSource - ./Classes/PhotoViewController.h + ../PhotoViewController.h + + + + PhotoViewController + + UIBarButtonItem + UIBarButtonItem + + + + NextPhoto: + UIBarButtonItem + + + PreviousPhoto: + UIBarButtonItem + + + + IBProjectSource + ../PhotoViewController.m + + + + + + UIActivityIndicatorView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIActivityIndicatorView.h + + + + UIBarButtonItem + UIBarItem + + IBFrameworkSource + UIKit.framework/Headers/UIBarButtonItem.h + + + + UIBarItem + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIBarItem.h + + + + UIGestureRecognizer + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIGestureRecognizer.h + + + + UIImageView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIImageView.h + + + + UILabel + UIView + + IBFrameworkSource + UIKit.framework/Headers/UILabel.h + + + + UIResponder + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + + + + UISearchBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UISearchBar.h + + + + UISearchDisplayController + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UISearchDisplayController.h + + + + UIToolbar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIToolbar.h + + + + UIView + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIView.h + + + + UIViewController + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIViewController.h 0 IBIPadFramework + NO + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + YES 3 @@ -466,6 +608,5 @@ {16, 20} {410, 263} - 1914 diff --git a/MediaNotes/MediaNotes/Shared Files/YYCommentViewController.cs b/MediaNotes/MediaNotes/Shared Files/YYCommentViewController.cs index 360a14a2..412891ad 100644 --- a/MediaNotes/MediaNotes/Shared Files/YYCommentViewController.cs +++ b/MediaNotes/MediaNotes/Shared Files/YYCommentViewController.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using CoreGraphics; using Foundation; using UIKit; diff --git a/MidiTest/MidiTest/AudioTest.cs b/MidiTest/MidiTest/AudioTest.cs index 9f1655df..5c3fe27c 100644 --- a/MidiTest/MidiTest/AudioTest.cs +++ b/MidiTest/MidiTest/AudioTest.cs @@ -17,7 +17,6 @@ namespace MidiTest { AUGraph processingGraph; AudioUnit.AudioUnit samplerUnit; - AudioUnit.AudioUnit ioUnit; MidiClient virtualMidi; MidiEndpoint virtualEndpoint; @@ -53,7 +52,6 @@ namespace MidiTest samplerUnit = processingGraph.GetNodeInfo (samplerNode); - ioUnit = processingGraph.GetNodeInfo (ioNode); return true; } diff --git a/MonoCatalog-MonoDevelop/AddressBookController.xib.cs b/MonoCatalog-MonoDevelop/AddressBookController.xib.cs index 3fa4b8c1..b936cb7d 100644 --- a/MonoCatalog-MonoDevelop/AddressBookController.xib.cs +++ b/MonoCatalog-MonoDevelop/AddressBookController.xib.cs @@ -8,74 +8,76 @@ using UIKit; namespace MonoCatalog { - public partial class AddressBookController : UIViewController - { - - ABPeoplePickerNavigationController p; - - public AddressBookController () : base ("AddressBookController", null) + public partial class AddressBookController : UIViewController { - } - protected override void Dispose (bool disposing) - { - if (p != null) { - p.Dispose (); - p = null; - } - base.Dispose (disposing); - } + ABPeoplePickerNavigationController p; - public override void ViewDidLoad () - { - base.ViewDidLoad (); - NavigationController.NavigationBar.Translucent = false; - } + public AddressBookController () : base ("AddressBookController", null) + { + } - ABPeoplePickerNavigationController GetPicker () - { - if (p != null) - return p; + protected override void Dispose (bool disposing) + { + if (p != null) { + p.Dispose (); + p = null; + } + base.Dispose (disposing); + } - p = new ABPeoplePickerNavigationController (); - p.SelectPerson += (o, e) => { - Console.Error.WriteLine ("# select Person: {0}", e.Person); - toString.Text = e.Person.ToString (); - firstName.Text = e.Person.FirstName; - lastName.Text = e.Person.LastName; - property.Text = ""; - identifier.Text = ""; - e.Continue = selectProperty.On; - if (!e.Continue) - DismissModalViewController (true); - }; - p.PerformAction += (o, e) => { - Console.Error.WriteLine ("# perform action; person={0}", e.Person); - toString.Text = e.Person.ToString (); - firstName.Text = e.Person.FirstName; - lastName.Text = e.Person.LastName; - property.Text = e.Property.ToString (); - identifier.Text = e.Identifier.HasValue ? e.Identifier.ToString () : ""; - e.Continue = performAction.On; - if (!e.Continue) - DismissModalViewController (true); - }; - p.Cancelled += (o, e) => { - Console.Error.WriteLine ("# select Person cancelled."); - toString.Text = "Cancelled"; - firstName.Text = ""; - lastName.Text = ""; - property.Text = ""; - identifier.Text = ""; - DismissModalViewController (true); - }; - return p; - } + public override void ViewDidLoad () + { + base.ViewDidLoad (); + NavigationController.NavigationBar.Translucent = false; + } - partial void showPicker (UIKit.UIButton sender) - { - Console.Error.WriteLine ("# Select Contacts pushed!"); - PresentModalViewController (GetPicker (), true); + ABPeoplePickerNavigationController GetPicker () + { + if (p != null) + return p; + + p = new ABPeoplePickerNavigationController (); + p.SelectPerson += (o, e) => { + Console.Error.WriteLine ("# select Person: {0}", e.Person); + toString.Text = e.Person.ToString (); + firstName.Text = e.Person.FirstName; + lastName.Text = e.Person.LastName; + property.Text = ""; + identifier.Text = ""; + e.Continue = selectProperty.On; + if (!e.Continue) + DismissModalViewController (true); + }; + + p.PerformAction += (o, e) => { + Console.Error.WriteLine ("# perform action; person={0}", e.Person); + toString.Text = e.Person.ToString (); + firstName.Text = e.Person.FirstName; + lastName.Text = e.Person.LastName; + property.Text = e.Property.ToString (); + identifier.Text = e.Identifier.HasValue ? e.Identifier.ToString () : ""; + e.Continue = performAction.On; + if (!e.Continue) + DismissModalViewController (true); + }; + + p.Cancelled += (o, e) => { + Console.Error.WriteLine ("# select Person cancelled."); + toString.Text = "Cancelled"; + firstName.Text = ""; + lastName.Text = ""; + property.Text = ""; + identifier.Text = ""; + DismissModalViewController (true); + }; + return p; + } + + partial void showPicker (UIKit.UIButton sender) + { + Console.Error.WriteLine ("# Select Contacts pushed!"); + PresentModalViewController (GetPicker (), true); + } } - } } diff --git a/MonoCatalog-MonoDevelop/Info.plist b/MonoCatalog-MonoDevelop/Info.plist index 07db6647..13802fa5 100644 --- a/MonoCatalog-MonoDevelop/Info.plist +++ b/MonoCatalog-MonoDevelop/Info.plist @@ -23,5 +23,11 @@ 5.1.1 CFBundleIdentifier com.xamarin.monocatalog + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + diff --git a/MotionGraphs/MotionGraphs/GraphView.cs b/MotionGraphs/MotionGraphs/GraphView.cs index 53da60ee..a3e70a0d 100644 --- a/MotionGraphs/MotionGraphs/GraphView.cs +++ b/MotionGraphs/MotionGraphs/GraphView.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using CoreGraphics; using UIKit; using Foundation; using CoreGraphics; diff --git a/MoviePlayback/MoviePlaybackSample/MoviePlayback.csproj b/MoviePlayback/MoviePlaybackSample/MoviePlayback.csproj index 752f0396..8aa1dfd7 100644 --- a/MoviePlayback/MoviePlaybackSample/MoviePlayback.csproj +++ b/MoviePlayback/MoviePlaybackSample/MoviePlayback.csproj @@ -24,10 +24,11 @@ False True True - None i386 + iPhone Developer + true none diff --git a/MoviePlayback/MoviePlaybackSample/MoviePlaybackSampleViewController.cs b/MoviePlayback/MoviePlaybackSample/MoviePlaybackSampleViewController.cs index 627398f5..80312033 100644 --- a/MoviePlayback/MoviePlaybackSample/MoviePlaybackSampleViewController.cs +++ b/MoviePlayback/MoviePlaybackSample/MoviePlaybackSampleViewController.cs @@ -60,25 +60,5 @@ namespace MoviePlaybackSample }; } - - [Obsolete] - public override void ViewDidUnload() - { - base.ViewDidUnload(); - } - - [Obsolete] - public override bool ShouldAutorotateToInterfaceOrientation(UIInterfaceOrientation toInterfaceOrientation) - { - // Return true for supported orientations - if (UserInterfaceIdiomIsPhone) - { - return (toInterfaceOrientation != UIInterfaceOrientation.PortraitUpsideDown); - } - else - { - return true; - } - } } } diff --git a/MultichannelMixer/MultichannelMixer/AppDelegate.cs b/MultichannelMixer/MultichannelMixer/AppDelegate.cs index 8edec285..be01b739 100644 --- a/MultichannelMixer/MultichannelMixer/AppDelegate.cs +++ b/MultichannelMixer/MultichannelMixer/AppDelegate.cs @@ -34,6 +34,7 @@ using System.Diagnostics; using Foundation; using UIKit; using AVFoundation; +using System.Threading.Tasks; namespace MultichannelMixer { @@ -73,7 +74,7 @@ namespace MultichannelMixer { } - public override async void FinishedLaunching (UIApplication application) + public override void FinishedLaunching (UIApplication application) { // Configure the audio session var sessionInstance = AVAudioSession.SharedInstance (); diff --git a/Notifications/Info.plist b/Notifications/Info.plist index 710ea4f4..6d5ade0b 100644 --- a/Notifications/Info.plist +++ b/Notifications/Info.plist @@ -21,5 +21,12 @@ 1 + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + diff --git a/OpenGL/OpenGLES20Example/GLTexture.cs b/OpenGL/OpenGLES20Example/GLTexture.cs index 5ffe1672..d358a703 100644 --- a/OpenGL/OpenGLES20Example/GLTexture.cs +++ b/OpenGL/OpenGLES20Example/GLTexture.cs @@ -6,7 +6,6 @@ using Foundation; using UIKit; using CoreImage; using CoreGraphics; -using CoreGraphics; namespace OpenGLES20Example { diff --git a/OpenGL/PerVertexDirectionalLighting/GLTexture.cs b/OpenGL/PerVertexDirectionalLighting/GLTexture.cs index 0363c6c4..06a044f4 100644 --- a/OpenGL/PerVertexDirectionalLighting/GLTexture.cs +++ b/OpenGL/PerVertexDirectionalLighting/GLTexture.cs @@ -6,7 +6,6 @@ using Foundation; using UIKit; using CoreImage; using CoreGraphics; -using CoreGraphics; namespace PerVertexDirectionalLighting { diff --git a/PaintCode/PaintCodeDemo/BlueButton/BlueButton.cs b/PaintCode/PaintCodeDemo/BlueButton/BlueButton.cs index c0b28acb..e9631903 100644 --- a/PaintCode/PaintCodeDemo/BlueButton/BlueButton.cs +++ b/PaintCode/PaintCodeDemo/BlueButton/BlueButton.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; namespace PaintCode { diff --git a/PaintCode/PaintCodeDemo/Calendar/CustomBadgeElement.cs b/PaintCode/PaintCodeDemo/Calendar/CustomBadgeElement.cs index 0abf5793..3ff2308e 100644 --- a/PaintCode/PaintCodeDemo/Calendar/CustomBadgeElement.cs +++ b/PaintCode/PaintCodeDemo/Calendar/CustomBadgeElement.cs @@ -13,7 +13,6 @@ using System.Collections; using System.Collections.Generic; using UIKit; using CoreGraphics; -using CoreGraphics; using Foundation; namespace PaintCode diff --git a/PaintCode/PaintCodeDemo/GlossyButton/GlossyButton.cs b/PaintCode/PaintCodeDemo/GlossyButton/GlossyButton.cs index 0f6c2806..783fe08b 100644 --- a/PaintCode/PaintCodeDemo/GlossyButton/GlossyButton.cs +++ b/PaintCode/PaintCodeDemo/GlossyButton/GlossyButton.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; using Foundation; namespace PaintCode @@ -111,12 +110,13 @@ namespace PaintCode using (var colorSpace = CGColorSpace.CreateDeviceRGB ()) { - //// Abstracted Graphic Attributes - var textContent = this.Title (UIControlState.Normal); //"STOP"; - var font = UIFont.SystemFontOfSize (18); + // Abstracted Graphic Attributes + // var textContent = this.Title (UIControlState.Normal); //"STOP"; + // var font = UIFont.SystemFontOfSize (18); + // ------------- START PAINTCODE ------------- -//// Color Declarations +// Color Declarations UIColor frameColorTop = UIColor.FromRGBA (0.20f, 0.20f, 0.20f, 1.00f); UIColor frameShadowColor = UIColor.FromRGBA (1.00f, 1.00f, 1.00f, 0.40f); @@ -133,7 +133,7 @@ namespace PaintCode (buttonColorRGBA [3] * 0.2f + 0.8f) ); -//// Gradient Declarations +// Gradient Declarations var glossyGradientColors = new CGColor [] { glossyColorUp.CGColor, glossyColorBottom.CGColor @@ -141,22 +141,22 @@ namespace PaintCode var glossyGradientLocations = new nfloat [] { 0, 1 }; var glossyGradient = new CGGradient (colorSpace, glossyGradientColors, glossyGradientLocations); -//// Shadow Declarations +// Shadow Declarations var frameInnerShadow = frameShadowColor.CGColor; var frameInnerShadowOffset = new CGSize (0, -0); - var frameInnerShadowBlurRadius = 3; + const int frameInnerShadowBlurRadius = 3; var buttonInnerShadow = UIColor.Black.CGColor; var buttonInnerShadowOffset = new CGSize (0, -0); - var buttonInnerShadowBlurRadius = 12; + const int buttonInnerShadowBlurRadius = 12; var textShadow = UIColor.Black.CGColor; var textShadowOffset = new CGSize (0, -0); - var textShadowBlurRadius = 1; + const int textShadowBlurRadius = 1; var buttonShadow = UIColor.Black.CGColor; var buttonShadowOffset = new CGSize (0, isPressed ? 0 : 2); // ADDED this code after PaintCode var buttonShadowBlurRadius = isPressed ? 2 : 3; // ADDED this code after PaintCode -//// outerFrame Drawing +// outerFrame Drawing var outerFramePath = UIBezierPath.FromRoundedRect (new CGRect (2.5f, 1.5f, 120, 32), 8); context.SaveState (); context.SetShadow (buttonShadowOffset, buttonShadowBlurRadius, buttonShadow); @@ -168,14 +168,14 @@ namespace PaintCode outerFramePath.LineWidth = 1; outerFramePath.Stroke (); -//// innerFrame Drawing +// innerFrame Drawing var innerFramePath = UIBezierPath.FromRoundedRect (new CGRect (5.5f, 4.5f, 114, 26), 5); context.SaveState (); context.SetShadow (frameInnerShadowOffset, frameInnerShadowBlurRadius, frameInnerShadow); buttonColor.SetFill (); innerFramePath.Fill (); -////// innerFrame Inner Shadow +// innerFrame Inner Shadow var innerFrameBorderRect = innerFramePath.Bounds; innerFrameBorderRect.Inflate (buttonInnerShadowBlurRadius, buttonInnerShadowBlurRadius); innerFrameBorderRect.Offset (-buttonInnerShadowOffset.Width, -buttonInnerShadowOffset.Height); @@ -209,21 +209,21 @@ namespace PaintCode innerFramePath.LineWidth = 1; innerFramePath.Stroke (); -//// Rounded Rectangle Drawing +// Rounded Rectangle Drawing var roundedRectanglePath = UIBezierPath.FromRoundedRect (new CGRect (8, 6, 109, 9), 4); context.SaveState (); roundedRectanglePath.AddClip (); context.DrawLinearGradient (glossyGradient, new CGPoint (62.5f, 6), new CGPoint (62.5f, 15), 0); context.RestoreState (); -//// Text Drawing - var textRect = new CGRect (18, 6, 90, 28); +// Text Drawing + // var textRect = new CGRect (18, 6, 90, 28); context.SaveState (); context.SetShadow(textShadowOffset, textShadowBlurRadius, textShadow); glossyColorUp.SetFill (); // Use default button-drawn text - //new NSString(textContent).DrawString(textRect, font, UILineBreakMode.WordWrap, UITextAlignment.Center); + // new NSString(textContent).DrawString(textRect, font, UILineBreakMode.WordWrap, UITextAlignment.Center); context.RestoreState (); // ------------- END PAINTCODE ------------- diff --git a/PaintCode/PaintCodeDemo/LineArt/DrawingView.cs b/PaintCode/PaintCodeDemo/LineArt/DrawingView.cs index 7ff53e50..3f9b43b0 100644 --- a/PaintCode/PaintCodeDemo/LineArt/DrawingView.cs +++ b/PaintCode/PaintCodeDemo/LineArt/DrawingView.cs @@ -1,7 +1,6 @@ using System; using UIKit; using CoreGraphics; -using CoreGraphics; using Foundation; namespace PaintCode diff --git a/PinchIt/Cell.cs b/PinchIt/Cell.cs index af977bae..af91dc3c 100755 --- a/PinchIt/Cell.cs +++ b/PinchIt/Cell.cs @@ -1,5 +1,4 @@ using System; -using CoreGraphics; using UIKit; using CoreGraphics; diff --git a/QRchestra/QRchestra/Info.plist b/QRchestra/QRchestra/Info.plist index 4ca61c73..e7183c60 100644 --- a/QRchestra/QRchestra/Info.plist +++ b/QRchestra/QRchestra/Info.plist @@ -9,6 +9,7 @@ UISupportedInterfaceOrientations UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight MinimumOSVersion 7.0 diff --git a/QRchestra/QRchestra/ReceiveViewController.cs b/QRchestra/QRchestra/ReceiveViewController.cs index 9f22e327..f34af778 100644 --- a/QRchestra/QRchestra/ReceiveViewController.cs +++ b/QRchestra/QRchestra/ReceiveViewController.cs @@ -1,5 +1,4 @@ using System; -using CoreGraphics; using Foundation; using UIKit; using CoreGraphics; @@ -14,15 +13,12 @@ namespace QRchestra { public partial class ReceiveViewController : UIViewController { - UIPopoverController sendPopoverController; - int barcodeIndex; AVCaptureVideoPreviewLayer previewLayer; CALayer barcodeTargetLayer; SessionManager sessionManager; Synth synth; - NSTimer stepTimer; NSTimer barcodeTimer; public UIColor OverlayColor { @@ -81,8 +77,6 @@ namespace QRchestra synth = new Synth (); synth.LoadPreset (this); - - stepTimer = NSTimer.CreateRepeatingScheduledTimer (0.15, step); } partial void handleTap (UIGestureRecognizer recognizer) diff --git a/QRchestra/QRchestra/SendViewController.cs b/QRchestra/QRchestra/SendViewController.cs index 5fac74ce..bd8822a8 100644 --- a/QRchestra/QRchestra/SendViewController.cs +++ b/QRchestra/QRchestra/SendViewController.cs @@ -1,4 +1,3 @@ -using CoreGraphics; using UIKit; using System.Collections.Generic; using CoreAnimation; @@ -18,8 +17,6 @@ namespace QRchestra int[] currentBank = new [] { 0, 0, 0, 0 }; const int maxNumberOfBanks = 3; - string machineReadableCodeType; - List keyImageViews; public SendViewController () : base ("SendViewController", null) diff --git a/QRchestra/QRchestra/SessionManager.cs b/QRchestra/QRchestra/SessionManager.cs index 4b57778d..f0488e97 100644 --- a/QRchestra/QRchestra/SessionManager.cs +++ b/QRchestra/QRchestra/SessionManager.cs @@ -19,15 +19,10 @@ namespace QRchestra DispatchQueue delegateCallbackQueue; DispatchQueue sessionQueue; - List previousSecondTimestamps; - AVCaptureDeviceInput videoInput; AVCaptureDevice videoDevice; - AVCaptureConnection audioConnection; - AVCaptureConnection videoConnection; bool running; - bool startCaptureSessionOnEnteringForeground; NSObject applicationWillEnterForegroundNotificationObserver; @@ -39,7 +34,6 @@ namespace QRchestra public SessionManager () { - previousSecondTimestamps = new List (); sessionQueue = new DispatchQueue ("com.apple.sample.sessionmanager.capture"); pipelineRunningTask = 0; } @@ -133,9 +127,6 @@ namespace QRchestra NSError error = (NSError)notification.UserInfo [AVCaptureSession.ErrorKey]; if (error.Code == (int)AVError.DeviceIsNotAvailableInBackground) { Console.WriteLine ("Device not available in background"); - - if (running) - startCaptureSessionOnEnteringForeground = true; } else if (error.Code == (int)AVError.MediaServicesWereReset) Console.WriteLine ("Media services were reset"); else @@ -168,7 +159,6 @@ namespace QRchestra void applicationWillEnterForeground () { sessionQueue.DispatchSync (delegate { - startCaptureSessionOnEnteringForeground = false; if (running) CaptureSession.StartRunning (); });