Skip to content

Convert to unified API #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 8, 2014
Merged

Convert to unified API #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ obj/
[Rr]elease*/
_ReSharper*/
[Tt]est[Rr]esult*
packages/
*.userprefs
2 changes: 1 addition & 1 deletion Cirrious.FluentLayout/AdvancedFluentLayoutExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Project Lead - Stuart Lodge, @slodge, me@slodge.com

using System.Collections.Generic;
using MonoTouch.UIKit;
using UIKit;

namespace Cirrious.FluentLayouts.Touch
{
Expand Down
12 changes: 6 additions & 6 deletions Cirrious.FluentLayout/Cirrious.FluentLayouts.Touch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" 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>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{75D2DA9D-DFD4-49A1-98FB-FE0F0677EF0F}</ProjectGuid>
<ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace>Cirrious.FluentLayouts.Touch</RootNamespace>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AssemblyName>Cirrious.FluentLayouts.Touch</AssemblyName>
<TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -48,7 +48,7 @@
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="monotouch" />
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
4 changes: 2 additions & 2 deletions Cirrious.FluentLayout/FluentLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

using System;
using System.Collections.Generic;
using MonoTouch.Foundation;
using MonoTouch.UIKit;
using UIKit;
using Foundation;

namespace Cirrious.FluentLayouts.Touch
{
Expand Down
2 changes: 1 addition & 1 deletion Cirrious.FluentLayout/FluentLayoutExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

using System.Collections.Generic;
using System.Linq;
using MonoTouch.UIKit;
using UIKit;

namespace Cirrious.FluentLayouts.Touch
{
Expand Down
3 changes: 1 addition & 2 deletions Cirrious.FluentLayout/RowSet-WorkInProgress/RowSet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using MonoTouch.UIKit;
using UIKit;

namespace Cirrious.FluentLayouts.Touch.RowSet
{
Expand Down
2 changes: 1 addition & 1 deletion Cirrious.FluentLayout/UIViewAndLayoutAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//
// Project Lead - Stuart Lodge, @slodge, me@slodge.com

using MonoTouch.UIKit;
using UIKit;

namespace Cirrious.FluentLayouts.Touch
{
Expand Down
34 changes: 16 additions & 18 deletions QuickLayout.Core/QuickLayout.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>QuickLayout.Core</RootNamespace>
<AssemblyName>QuickLayout.Core</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile158</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
</PropertyGroup>
Expand Down Expand Up @@ -45,29 +45,27 @@
<Compile Include="ViewModels\SearchViewModel.cs" />
<Compile Include="ViewModels\TipViewModel.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup>
<None Include="packages.config" />
<None Include="ToDo-MvvmCross\_ Core.txt" />
</ItemGroup>
<ItemGroup>
<Reference Include="Cirrious.CrossCore">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.14\lib\portable-win+net45+MonoAndroid+MonoTouch+sl40+wp71\Cirrious.CrossCore.dll</HintPath>
</Reference>
<Reference Include="Cirrious.MvvmCross">
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.0.14\lib\portable-win+net45+MonoAndroid+MonoTouch+sl40+wp71\Cirrious.MvvmCross.dll</HintPath>
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.5.0-alpha2\lib\portable-win+net45+wp8+win8+wpa81+Xamarin.iOS10+MonoAndroid\Cirrious.CrossCore.dll</HintPath>
</Reference>
<Reference Include="Cirrious.MvvmCross.Localization">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.14\lib\portable-win+net45+MonoAndroid+MonoTouch+sl40+wp71\Cirrious.MvvmCross.Localization.dll</HintPath>
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.5.0-alpha2\lib\portable-win+net45+wp8+win8+wpa81+Xamarin.iOS10+MonoAndroid\Cirrious.MvvmCross.Localization.dll</HintPath>
</Reference>
<Reference Include="Cirrious.MvvmCross">
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.5.0-alpha2\lib\portable-win+net45+wp8+win8+wpa81+Xamarin.iOS10+MonoAndroid\Cirrious.MvvmCross.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="ToDo-MvvmCross\_ Core.txt" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
23 changes: 0 additions & 23 deletions QuickLayout.Core/ToDo-MvvmCross/_ Core.txt
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions QuickLayout.Core/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MvvmCross" version="3.0.14" targetFramework="portable-win+net45+sl40+wp71" />
<package id="MvvmCross.HotTuna.CrossCore" version="3.0.14" targetFramework="portable-win+net45+sl40+wp71" />
<package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.0.14" targetFramework="portable-win+net45+sl40+wp71" />
<package id="MvvmCross.HotTuna.StarterPack" version="3.0.14" targetFramework="portable-win+net45+sl40+wp71" />
<package id="MvvmCross.PortableSupport" version="3.0.14" targetFramework="portable-win+net45+sl40+wp71" />
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MvvmCross" version="3.5.0-alpha2" targetFramework="portable-net45+win+wpa81+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
<package id="MvvmCross.HotTuna.CrossCore" version="3.5.0-alpha2" targetFramework="portable-net45+win+wpa81+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
<package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.5.0-alpha2" targetFramework="portable-net45+win+wpa81+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
<package id="MvvmCross.HotTuna.StarterPack" version="3.5.0-alpha2" targetFramework="portable-net45+win+wpa81+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
<package id="MvvmCross.PortableSupport" version="3.5.0-alpha2" targetFramework="portable-net45+win+wpa81+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
</packages>
4 changes: 2 additions & 2 deletions QuickLayout.Touch/AppDelegate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using MonoTouch.Foundation;
using MonoTouch.UIKit;
using Foundation;
using UIKit;
using Cirrious.CrossCore;
using Cirrious.MvvmCross.Touch.Platform;
using Cirrious.MvvmCross.ViewModels;
Expand Down
2 changes: 1 addition & 1 deletion QuickLayout.Touch/LinkerPleaseInclude.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Collections.Specialized;
using System.Windows.Input;
using MonoTouch.UIKit;
using UIKit;

namespace QuickLayout.Touch
{
Expand Down
7 changes: 1 addition & 6 deletions QuickLayout.Touch/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;

using MonoTouch.Foundation;
using MonoTouch.UIKit;
using UIKit;

namespace QuickLayout.Touch
{
Expand Down
6 changes: 3 additions & 3 deletions QuickLayout.Touch/MyViewController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using MonoTouch.UIKit;
using System.Drawing;
using UIKit;
using CoreGraphics;

namespace QuickLayout.Touch
{
Expand All @@ -25,7 +25,7 @@ public override void ViewDidLoad()

button = UIButton.FromType(UIButtonType.RoundedRect);

button.Frame = new RectangleF(
button.Frame = new CGRect(
View.Frame.Width / 2 - buttonWidth / 2,
View.Frame.Height / 2 - buttonHeight / 2,
buttonWidth,
Expand Down
64 changes: 37 additions & 27 deletions QuickLayout.Touch/QuickLayout.Touch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5739EE87-45C0-496A-8388-A09CDB906501}</ProjectGuid>
<ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Exe</OutputType>
<RootNamespace>QuickLayout.Touch</RootNamespace>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AssemblyName>QuickLayoutTouch</AssemblyName>
<TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -44,6 +44,11 @@
<ConsolePause>false</ConsolePause>
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
<IpaPackageName>
</IpaPackageName>
<MtouchI18n>
</MtouchI18n>
<MtouchArch>ARMv7</MtouchArch>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
Expand Down Expand Up @@ -72,6 +77,11 @@
<WarningLevel>4</WarningLevel>
<ConsolePause>False</ConsolePause>
<CodesignKey>iPhone Distribution</CodesignKey>
<IpaPackageName>
</IpaPackageName>
<MtouchI18n>
</MtouchI18n>
<MtouchArch>ARMv7</MtouchArch>
</PropertyGroup>
<ItemGroup>
<Compile Include="Bootstrap\MethodBindingPluginBootstrap.cs" />
Expand All @@ -93,48 +103,48 @@
<ItemGroup>
<Compile Include="MyViewController.cs" />
<BundleResource Include="Resources\Default.png" />
<BundleResource Include="Resources\Default@2x.png" />
<BundleResource Include="Resources\Default-568h@2x.png" />
<BundleResource Include="Resources\Default%402x.png" />
<BundleResource Include="Resources\Default-568h%402x.png" />
</ItemGroup>
<ItemGroup>
<Reference Include="Cirrious.CrossCore">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.14\lib\MonoTouch\Cirrious.CrossCore.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
<Reference Include="Cirrious.CrossCore.Touch">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.14\lib\MonoTouch\Cirrious.CrossCore.Touch.dll</HintPath>
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.5.0-alpha2\lib\Xamarin.iOS10\Cirrious.CrossCore.Touch.dll</HintPath>
</Reference>
<Reference Include="Cirrious.MvvmCross">
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.0.14\lib\MonoTouch\Cirrious.MvvmCross.dll</HintPath>
<Reference Include="Cirrious.MvvmCross.Binding.Touch">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.5.0-alpha2\lib\Xamarin.iOS10\Cirrious.MvvmCross.Binding.Touch.dll</HintPath>
</Reference>
<Reference Include="Cirrious.MvvmCross.Binding">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.14\lib\MonoTouch\Cirrious.MvvmCross.Binding.dll</HintPath>
<Reference Include="Cirrious.CrossCore">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.5.0-alpha2\lib\Xamarin.iOS10\Cirrious.CrossCore.dll</HintPath>
</Reference>
<Reference Include="Cirrious.MvvmCross.Binding.Touch">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.14\lib\MonoTouch\Cirrious.MvvmCross.Binding.Touch.dll</HintPath>
<Reference Include="Cirrious.MvvmCross.Binding">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.5.0-alpha2\lib\Xamarin.iOS10\Cirrious.MvvmCross.Binding.dll</HintPath>
</Reference>
<Reference Include="Cirrious.MvvmCross.Localization">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.14\lib\MonoTouch\Cirrious.MvvmCross.Localization.dll</HintPath>
</Reference>
<Reference Include="Cirrious.MvvmCross.Plugins.MethodBinding">
<HintPath>..\packages\MvvmCross.HotTuna.Plugin.MethodBinding.3.0.14\lib\MonoTouch\Cirrious.MvvmCross.Plugins.MethodBinding.dll</HintPath>
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.5.0-alpha2\lib\Xamarin.iOS10\Cirrious.MvvmCross.Localization.dll</HintPath>
</Reference>
<Reference Include="Cirrious.MvvmCross.Touch">
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.0.14\lib\MonoTouch\Cirrious.MvvmCross.Touch.dll</HintPath>
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.5.0-alpha2\lib\Xamarin.iOS10\Cirrious.MvvmCross.Touch.dll</HintPath>
</Reference>
<Reference Include="Cirrious.MvvmCross">
<HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.5.0-alpha2\lib\Xamarin.iOS10\Cirrious.MvvmCross.dll</HintPath>
</Reference>
<Reference Include="Cirrious.MvvmCross.Plugins.MethodBinding">
<HintPath>..\packages\MvvmCross.HotTuna.Plugin.MethodBinding.3.5.0-alpha2\lib\Xamarin.iOS10\Cirrious.MvvmCross.Plugins.MethodBinding.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="monotouch" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Cirrious.FluentLayout\Cirrious.FluentLayouts.Touch.csproj">
<Project>{75d2da9d-dfd4-49a1-98fb-fe0f0677ef0f}</Project>
<Project>{75D2DA9D-DFD4-49A1-98FB-FE0F0677EF0F}</Project>
<Name>Cirrious.FluentLayouts.Touch</Name>
</ProjectReference>
<ProjectReference Include="..\QuickLayout.Core\QuickLayout.Core.csproj">
<Project>{849afb57-994a-42d9-a786-ef34fc951cde}</Project>
<Project>{849AFB57-994A-42D9-A786-EF34FC951CDE}</Project>
<Name>QuickLayout.Core</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
2 changes: 1 addition & 1 deletion QuickLayout.Touch/Setup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using MonoTouch.UIKit;
using UIKit;
using Cirrious.CrossCore.Platform;
using Cirrious.MvvmCross.ViewModels;
using Cirrious.MvvmCross.Touch.Platform;
Expand Down
6 changes: 3 additions & 3 deletions QuickLayout.Touch/Views/DetailsView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
using Cirrious.FluentLayouts.Touch;
using Cirrious.MvvmCross.Binding.BindingContext;
using Cirrious.MvvmCross.Touch.Views;
using MonoTouch.UIKit;
using MonoTouch.Foundation;
using UIKit;
using Foundation;
using QuickLayout.Core.ViewModels;
using MonoTouch.ObjCRuntime;
using ObjCRuntime;
using Cirrious.FluentLayouts;

namespace QuickLayout.Touch.Views
Expand Down
6 changes: 3 additions & 3 deletions QuickLayout.Touch/Views/FirstView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
using Cirrious.FluentLayouts.Touch;
using Cirrious.MvvmCross.Binding.BindingContext;
using Cirrious.MvvmCross.Touch.Views;
using MonoTouch.Foundation;
using MonoTouch.UIKit;
using MonoTouch.ObjCRuntime;
using Foundation;
using UIKit;
using ObjCRuntime;
using QuickLayout.Core.ViewModels;

namespace QuickLayout.Touch.Views
Expand Down
6 changes: 3 additions & 3 deletions QuickLayout.Touch/Views/FormGridView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using Cirrious.FluentLayouts.Touch.RowSet;
using Cirrious.MvvmCross.Binding.BindingContext;
using Cirrious.MvvmCross.Touch.Views;
using MonoTouch.Foundation;
using MonoTouch.UIKit;
using MonoTouch.ObjCRuntime;
using Foundation;
using UIKit;
using ObjCRuntime;
using QuickLayout.Core.ViewModels;

namespace QuickLayout.Touch.Views
Expand Down
Loading