Revert "iOS unified support"

component.yaml

@@ -1,30 +1,28 @@
-version: 1.1.5
+version: 1.1.3
+id: xamarin.social
 name: Xamarin.Social
 publisher: Xamarin
-id: xamarin.social
 publisher-url: http://xamarin.com/
 summary: Share statuses, links, and images on Facebook, Flickr, Twitter and more.
-monodoc: source/docs/
+details: component/Details.md
+license: License.md
+getting-started: component/GettingStarted.md
+monodocs: docs/
+no_build: true
 libraries:
-  ios: 
-    - src/Xamarin.Social.iOS/bin/classic/AnyCPU/Release/Xamarin.Social.iOS.dll
-    - src/Xamarin.Social.iOS/bin/classic/AnyCPU/Release/Xamarin.Auth.iOS.dll
-  ios-unified: 
-    - src/Xamarin.Social.iOS/bin/unified/AnyCPU/Release/Xamarin.Social.iOS.dll
-    - src/Xamarin.Social.iOS/bin/unified/AnyCPU/Release/Xamarin.Auth.iOS.dll
-  android: 
+  ios:
+    - src/Xamarin.Social.iOS/bin/Release/Xamarin.Social.iOS.dll
+    - src/Xamarin.Social.iOS/bin/Release/Xamarin.Auth.iOS.dll
+  android:
     - src/Xamarin.Social.Android/bin/Release/Xamarin.Social.Android.dll
     - src/Xamarin.Social.Android/bin/Release/Xamarin.Auth.Android.dll
 samples:
-  - name: "Android Sample"
-    path: samples-for-component-binary-references/Xamarin.Social.Sample.Android/Xamarin.Social.Sample.Android.sln
-    nobuild: true
-  - name: "iOS Classic Sample"
-    path: samples-for-component-binary-references/Xamarin.Social.Sample.iOS/Xamarin.Social.Sample.iOS-Classic.sln
-    nobuild: true
-  - name: "iOS Unified Sample"
-    path: samples-for-component-binary-references/Xamarin.Social.Sample.iOS/Xamarin.Social.Sample.iOS.sln
+  "Android Sample": samples/Xamarin.Social.Sample.Android/Xamarin.Social.Sample.Android.sln
+  "iOS Sample": samples/Xamarin.Social.Sample.iOS/Xamarin.Social.Sample.iOS.sln
+screenshots:
+  - component/screenshots/00.jpg
+icons:
+  - component/icons/xamarin.social_128x128.png
+  - component/icons/xamarin.social_512x512.png
 build:
-  - src/Xamarin.Social.iOS/Xamarin.Social.iOS.sln
-  - src/Xamarin.Social.iOS/Xamarin.Social.iOS-Classic.sln
-  - src/Xamarin.Social.Android/Xamarin.Social.Android.sln
+    - src/Xamarin.Social.sln

samples/Xamarin.Social.Sample.Android/Xamarin.Social.Sample.Android.csproj

@@ -46,7 +46,7 @@
     <Reference Include="System.Core" />
     <Reference Include="Mono.Android" />
     <Reference Include="Xamarin.Mobile">
-      <HintPath>..\..\src\Components\xamarin.mobile-0.7.4\lib\android\Xamarin.Mobile.dll</HintPath>
+      <HintPath>Components\xamarin.mobile-0.7.1\lib\android\Xamarin.Mobile.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -72,13 +72,13 @@
       <Name>Xamarin.Auth.Android</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Properties\AndroidManifest.xml" />
-  </ItemGroup>
   <ItemGroup>
     <XamarinComponentReference Include="xamarin.mobile">
-      <Version>0.7.4</Version>
+      <Version>0.7.1</Version>
       <Visible>False</Visible>
     </XamarinComponentReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Properties\AndroidManifest.xml" />
+  </ItemGroup>
 </Project>

samples/Xamarin.Social.Sample.iOS/AppDelegate.cs

@@ -1,13 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-#if ! __UNIFIED__
 using MonoTouch.Foundation;
 using MonoTouch.UIKit;
-#else
-using Foundation;
-using UIKit;
-#endif
 using MonoTouch.Dialog;
 using Xamarin.Media;
 using Xamarin.Social.Services;

samples/Xamarin.Social.Sample.iOS/Xamarin.Social.Sample.iOS.csproj

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{60BE34F8-EDDE-4AF9-96C6-485E08F3ED17}</ProjectGuid>
-    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectGuid>{E8DFC6B6-80B5-46C2-BB2C-3D6CC0BF291F}</ProjectGuid>
+    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>Xamarin.Social.Sample.iOS</RootNamespace>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
@@ -16,59 +16,53 @@
     <DebugSymbols>True</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>False</Optimize>
-    <DefineConstants>DEBUG;__UNIFIED__;</DefineConstants>
+    <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>True</MtouchDebug>
-    <IntermediateOutputPath>obj\unified\iPhoneSimulator\Debug\</IntermediateOutputPath>
-    <OutputPath>bin\unified\iPhoneSimulator\Debug\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
     <Optimize>True</Optimize>
+    <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
     <MtouchLink>None</MtouchLink>
-    <DefineConstants>__UNIFIED__;</DefineConstants>
-    <IntermediateOutputPath>obj\unified\iPhoneSimulator\Release\</IntermediateOutputPath>
-    <OutputPath>bin\unified\iPhoneSimulator\Release\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>True</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>False</Optimize>
+    <OutputPath>bin\iPhone\Debug</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
     <MtouchDebug>True</MtouchDebug>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <IntermediateOutputPath>obj\unified\iPhone\Debug\</IntermediateOutputPath>
-    <OutputPath>bin\unified\iPhone\Debug\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
     <Optimize>True</Optimize>
+    <OutputPath>bin\iPhone\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <DefineConstants>__UNIFIED__;</DefineConstants>
-    <IntermediateOutputPath>obj\unified\iPhone\Release\</IntermediateOutputPath>
-    <OutputPath>bin\unified\iPhone\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
-    <Reference Include="Xamarin.iOS" />
+    <Reference Include="monotouch" />
+    <Reference Include="MonoTouch.Dialog-1" />
     <Reference Include="Xamarin.Mobile">
-      <HintPath>..\..\src\Components\xamarin.mobile-0.7.4\lib\ios-unified\Xamarin.Mobile.dll</HintPath>
+      <HintPath>Components\xamarin.mobile-0.7.1\lib\ios\Xamarin.Mobile.dll</HintPath>
     </Reference>
-    <Reference Include="MonoTouch.Dialog-1" />
   </ItemGroup>
   <ItemGroup>
     <XamarinComponentReference Include="xamarin.mobile">
@@ -82,14 +76,14 @@
   <ItemGroup>
     <Compile Include="AppDelegate.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
   <ItemGroup>
     <ProjectReference Include="..\..\src\Xamarin.Social.iOS\Xamarin.Social.iOS.csproj">
-      <Project>{6D2E4130-354F-4F59-ADCA-701C7E4A0437}</Project>
+      <Project>{C91EF8FC-37E3-4952-A8A3-BA3A4422B0C5}</Project>
       <Name>Xamarin.Social.iOS</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Xamarin.Auth\src\Xamarin.Auth.iOS\Xamarin.Auth.iOS.csproj">
-      <Project>{19A091BD-B0E7-49FC-BF83-4118D91A7DC3}</Project>
+      <Project>{9309BCCC-AA7B-4195-A130-D4572FA9488D}</Project>
       <Name>Xamarin.Auth.iOS</Name>
     </ProjectReference>
   </ItemGroup>

src/Xamarin.Social.Android/Xamarin.Social.Android.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
+    <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BA8CBA8B-7F55-4167-B872-0BBF09F08B8C}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -32,6 +32,7 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <DefineConstants>PLATFORM_ANDROID</DefineConstants>
   </PropertyGroup>
   <ItemGroup>

src/Xamarin.Social.iOS/CheckedPickerView.cs

@@ -16,30 +16,11 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using MonoTouch.UIKit;
 using System.Drawing;
 using System.Collections.Generic;
 using System.Linq;
 
-#if __UNIFIED__
-using UIKit;
-using Foundation;
-using CoreAnimation;
-using CoreGraphics;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-using MonoTouch.CoreAnimation;
-using MonoTouch.CoreGraphics;
-
-using System.Drawing;
-using CGRect = global::System.Drawing.RectangleF;
-using CGPoint = global::System.Drawing.PointF;
-using CGSize = global::System.Drawing.SizeF;
-using nfloat = global::System.Single;
-using nint = global::System.Int32;
-using nuint = global::System.UInt32;
-#endif
-
 namespace Xamarin.Social
 {
 	class CheckedPickerView : UIPickerView
@@ -97,20 +78,12 @@ public CheckedPickerView (RectangleF frame)
 
 		class PickerDelegate : UIPickerViewDelegate
 		{
-			#if ! __UNIFIED__
 			public override UIView GetView (UIPickerView pickerView, int row, int component, UIView view)
-			#else
-			public  UIView GetView (UIPickerView pickerView, int row, int component, UIView view)
-			#endif
 			{
 				var label = view as PickerLabel;
 
 				if (label == null) {
-					#if ! __UNIFIED__
 					label = new PickerLabel (new RectangleF (16, 0, pickerView.Bounds.Width - 32, 44));
-					#else
-					label = new PickerLabel (new RectangleF ((float)16, (float)0, (float)(pickerView.Bounds.Width - 32), (float)44));
-					#endif
 				}
 
 				var cpv = (CheckedPickerView)pickerView;
@@ -121,12 +94,8 @@ public  UIView GetView (UIPickerView pickerView, int row, int component, UIView
 
 				return label;
 			}
-
-			#if ! __UNIFIED__
+
 			public override void Selected (UIPickerView pickerView, int row, int component)
-			#else
-			public void Selected (UIPickerView pickerView, int row, int component)
-			#endif
 			{
 				var n = pickerView.RowsInComponent (0);
 
@@ -143,21 +112,13 @@ public void Selected (UIPickerView pickerView, int row, int component)
 
 		class PickerDataSource : UIPickerViewDataSource
 		{
-			#if ! __UNIFIED__
 			public override int GetRowsInComponent (UIPickerView pickerView, int component)
-			#else
-			public override nint GetRowsInComponent (UIPickerView pickerView, nint component)
-			#endif
 			{
 				var cpv = (CheckedPickerView)pickerView;
 				return cpv.Items.Count;
 			}
 
-			#if ! __UNIFIED__
 			public override int GetComponentCount (UIPickerView pickerView)
-			#else
-			public override nint GetComponentCount (UIPickerView pickerView)
-			#endif
 			{
 				return 1;
 			}

src/Xamarin.Social.iOS/FoundationResponse.cs

@@ -17,25 +17,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
-#if __UNIFIED__
-using UIKit;
-using Foundation;
-using CoreAnimation;
-using CoreGraphics;
-#else
-using MonoTouch.UIKit;
 using MonoTouch.Foundation;
-using MonoTouch.CoreAnimation;
-using MonoTouch.CoreGraphics;
-
-using System.Drawing;
-using CGRect = global::System.Drawing.RectangleF;
-using CGPoint = global::System.Drawing.PointF;
-using CGSize = global::System.Drawing.SizeF;
-using nfloat = global::System.Single;
-using nint = global::System.Int32;
-using nuint = global::System.UInt32;
-#endif
 using Xamarin.Auth;
 
 namespace Xamarin.Social
@@ -44,20 +26,11 @@ class FoundationResponse : Response
 	{
 		NSData data;
 		Dictionary<string, string> headers;
-
-		#if ! __UNIFIED__
 		int statusCode;
-		#else 
-		nint statusCode;
-		#endif
 
 		public override HttpStatusCode StatusCode {
 			get {
-				#if ! __UNIFIED__
 				return (HttpStatusCode)statusCode;
-				#else
-				return (HttpStatusCode) (int)statusCode;
-				#endif
 			}
 		}
 
@@ -84,11 +57,7 @@ public override Stream GetResponseStream ()
 			var mutableData = data as NSMutableData;
 			if (mutableData != null) {
 				unsafe {
-					#if ! __UNIFIED__
 					return new UnmanagedMemoryStream ((byte*)mutableData.Bytes, mutableData.Length);
-					#else
-					return new UnmanagedMemoryStream ((byte*)mutableData.Bytes, (long) mutableData.Length);
-					#endif
 				}
 			} else {
 				return data.AsStream ();