Skip to content

Commit f21be5c

Browse files
committed
[safari] removed unused package
1 parent e611faa commit f21be5c

File tree

6 files changed

+13
-24
lines changed

6 files changed

+13
-24
lines changed

SafariViewController/csharp/SafariViewDemo.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@
6565
<Reference Include="System.Xml" />
6666
<Reference Include="System.Core" />
6767
<Reference Include="Xamarin.iOS" />
68-
<Reference Include="Calabash">
69-
<HintPath>packages\Xamarin.TestCloud.Agent.0.13.0\lib\Xamarin.iOS10\Calabash.dll</HintPath>
70-
</Reference>
7168
</ItemGroup>
7269
<ItemGroup>
7370
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Contents.json" />
@@ -79,7 +76,6 @@
7976
<ItemGroup>
8077
<None Include="Info.plist" />
8178
<None Include="Entitlements.plist" />
82-
<None Include="packages.config" />
8379
</ItemGroup>
8480
<ItemGroup>
8581
<Compile Include="Main.cs" />

SafariViewController/csharp/ViewController.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,24 @@ public override void ViewDidLoad ()
1919

2020
openButton.TouchUpInside += (sender, e) => {
2121
var sfvc = new SFSafariViewController (new NSUrl("http://xamarin.com"),true);
22-
2322
PresentViewController(sfvc, true, null);
2423
};
2524

2625
}
2726

27+
// API suggests this is required - but the dismiss seems to work without it
28+
// (ie. this isn't even getting called)
2829
[Foundation.Export ("safariViewControllerDidFinish:")]
2930
public void DidFinish (SFSafariViewController controller)
3031
{
3132
DismissViewController (true, null);
3233
}
34+
35+
36+
3337
public override void DidReceiveMemoryWarning ()
3438
{
3539
base.DidReceiveMemoryWarning ();
36-
// Release any cached data, images, etc that aren't in use.
3740
}
3841
}
3942
}

SafariViewController/csharp/packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

SafariViewController/fsharp/SafariViewDemoFS.fsproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@
7979
<Reference Include="mscorlib" />
8080
<Reference Include="FSharp.Core" />
8181
<Reference Include="Xamarin.iOS" />
82-
<Reference Include="Calabash">
83-
<HintPath>packages\Xamarin.TestCloud.Agent.0.13.0\lib\Xamarin.iOS10\Calabash.dll</HintPath>
84-
</Reference>
8582
</ItemGroup>
8683
<ItemGroup>
8784
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Contents.json" />
@@ -92,7 +89,6 @@
9289
<ItemGroup>
9390
<None Include="Info.plist" />
9491
<None Include="Entitlements.plist" />
95-
<None Include="packages.config" />
9692
</ItemGroup>
9793
<ItemGroup>
9894
<Compile Include="ViewController.fs" />

SafariViewController/fsharp/ViewController.fs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ type ViewController () as x =
1414
let sfvc = new SFSafariViewController (new NSUrl("http://xamarin.com"), true)
1515
x.PresentViewController (sfvc, true, null)
1616

17+
// still trying to figure this bit out...
18+
[<Export("safariViewControllerDidFinish:")>]
19+
let DidFinish (controller: SFSafariViewController) =
20+
x.DismissViewController (true, null)
21+
22+
interface ISFSafariViewControllerDelegate
23+
1724
override x.DidReceiveMemoryWarning () =
1825
// Releases the view if it doesn't have a superview.
1926
base.DidReceiveMemoryWarning ()
@@ -34,9 +41,4 @@ type ViewController () as x =
3441
toInterfaceOrientation <> UIInterfaceOrientation.PortraitUpsideDown
3542
else
3643
true
37-
38-
// interface ISFSafariViewControllerDelegate
39-
40-
// [<Export("safariViewControllerDidFinish:")>]
41-
// DidFinish (SFSafariViewController: controller) =
42-
// DismissViewController (true, null)
44+

SafariViewController/fsharp/packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)