[safari] removed unused package

conceptdev · Sep 5, 2015 · f21be5c · f21be5c
1 parent e611faa
commit f21be5c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 24 deletions.
diff --git a/SafariViewController/csharp/SafariViewDemo.csproj b/SafariViewController/csharp/SafariViewDemo.csproj
@@ -65,9 +65,6 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.iOS" />
-    <Reference Include="Calabash">
-      <HintPath>packages\Xamarin.TestCloud.Agent.0.13.0\lib\Xamarin.iOS10\Calabash.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Contents.json" />
@@ -79,7 +76,6 @@
   <ItemGroup>
     <None Include="Info.plist" />
     <None Include="Entitlements.plist" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Main.cs" />

diff --git a/SafariViewController/csharp/ViewController.cs b/SafariViewController/csharp/ViewController.cs
@@ -19,21 +19,24 @@ public override void ViewDidLoad ()
 
 			openButton.TouchUpInside += (sender, e) => {
 				var sfvc = new SFSafariViewController (new NSUrl("http://xamarin.com"),true);
-
 				PresentViewController(sfvc, true, null);
 			};
 
 		}
 
+		// API suggests this is required - but the dismiss seems to work without it
+		// (ie. this isn't even getting called)
 		[Foundation.Export ("safariViewControllerDidFinish:")]
 		public void DidFinish (SFSafariViewController controller)
 		{
 			DismissViewController (true, null);
 		}
+
+
+
 		public override void DidReceiveMemoryWarning ()
 		{
 			base.DidReceiveMemoryWarning ();
-			// Release any cached data, images, etc that aren't in use.
 		}
 	}
 }

diff --git a/SafariViewController/csharp/packages.config b/SafariViewController/csharp/packages.config
diff --git a/SafariViewController/fsharp/SafariViewDemoFS.fsproj b/SafariViewController/fsharp/SafariViewDemoFS.fsproj
@@ -79,9 +79,6 @@
     <Reference Include="mscorlib" />
     <Reference Include="FSharp.Core" />
     <Reference Include="Xamarin.iOS" />
-    <Reference Include="Calabash">
-      <HintPath>packages\Xamarin.TestCloud.Agent.0.13.0\lib\Xamarin.iOS10\Calabash.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Contents.json" />
@@ -92,7 +89,6 @@
   <ItemGroup>
     <None Include="Info.plist" />
     <None Include="Entitlements.plist" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ViewController.fs" />

diff --git a/SafariViewController/fsharp/ViewController.fs b/SafariViewController/fsharp/ViewController.fs
@@ -14,6 +14,13 @@ type ViewController () as x =
         let sfvc = new SFSafariViewController (new NSUrl("http://xamarin.com"), true)
         x.PresentViewController (sfvc, true, null)
 
+    // still trying to figure this bit out...
+    [<Export("safariViewControllerDidFinish:")>]
+    let DidFinish (controller: SFSafariViewController) =
+        x.DismissViewController (true, null)
+
+    interface ISFSafariViewControllerDelegate 
+
     override x.DidReceiveMemoryWarning () =
         // Releases the view if it doesn't have a superview.
         base.DidReceiveMemoryWarning ()
@@ -34,9 +41,4 @@ type ViewController () as x =
            toInterfaceOrientation <> UIInterfaceOrientation.PortraitUpsideDown
         else
            true
-
-//    interface ISFSafariViewControllerDelegate 
-
-//    [<Export("safariViewControllerDidFinish:")>]
-//    DidFinish (SFSafariViewController: controller) =
-//        DismissViewController (true, null)
+
diff --git a/SafariViewController/fsharp/packages.config b/SafariViewController/fsharp/packages.config