N-24-Split to 158,iOS7,3.1.1.-beta2

MvvmCross · Jan 5, 2014 · c0f3d00 · c0f3d00
1 parent d823b2b
commit c0f3d00
Show file tree

Hide file tree

Showing 216 changed files with 626 additions and 1,409 deletions.
diff --git a/N-24-Split/Splitter.Core/Splitter.Core.csproj b/N-24-Split/Splitter.Core/Splitter.Core.csproj
@@ -11,7 +11,7 @@
     <RootNamespace>Splitter.Core</RootNamespace>
     <AssemblyName>Splitter.Core</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Profile104</TargetFrameworkProfile>
+    <TargetFrameworkProfile>Profile158</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
@@ -32,29 +32,25 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="App.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ViewModels\FirstViewModel.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="Cirrious.CrossCore">
-      <HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.7\lib\portable-win+net45+MonoAndroid16+MonoTouch40+sl40+wp71\Cirrious.CrossCore.dll</HintPath>
+      <HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta2\lib\portable-win+net45+sl50+wp8+MonoAndroid+MonoTouch\Cirrious.CrossCore.dll</HintPath>
     </Reference>
     <Reference Include="Cirrious.MvvmCross">
-      <HintPath>..\packages\MvvmCross.HotTuna.StarterPack.3.0.7\lib\portable-win+net45+MonoAndroid16+MonoTouch40+sl40+wp71\Cirrious.MvvmCross.dll</HintPath>
+      <HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.1.1-beta2\lib\portable-win+net45+sl50+wp8+MonoAndroid+MonoTouch\Cirrious.MvvmCross.dll</HintPath>
     </Reference>
     <Reference Include="Cirrious.MvvmCross.Localization">
-      <HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.7\lib\portable-win+net45+MonoAndroid16+MonoTouch40+sl40+wp71\Cirrious.MvvmCross.Localization.dll</HintPath>
+      <HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta2\lib\portable-win+net45+sl50+wp8+MonoAndroid+MonoTouch\Cirrious.MvvmCross.Localization.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.

diff --git a/N-24-Split/Splitter.Core/packages.config b/N-24-Split/Splitter.Core/packages.config
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MvvmCross" version="3.0.7" targetFramework="portable-win+net45+MonoAndroid16+MonoTouch40+sl40+wp71" />
-  <package id="MvvmCross.HotTuna.CrossCore" version="3.0.7" targetFramework="portable-win+net45+MonoAndroid16+MonoTouch40+sl40+wp71" />
-  <package id="MvvmCross.HotTuna.StarterPack" version="3.0.7" targetFramework="portable-win+net45+MonoAndroid16+MonoTouch40+sl40+wp71" />
-  <package id="MvvmCross.PortableSupport" version="3.0.7" targetFramework="portable-win+net45+MonoAndroid16+MonoTouch40+sl40+wp71" />
+  <package id="MvvmCross" version="3.1.1-beta2" targetFramework="portable-win+net45+sl50+wp80+MonoAndroid10+MonoTouch10" />
+  <package id="MvvmCross.HotTuna.CrossCore" version="3.1.1-beta2" targetFramework="portable-win+net45+sl50+wp80+MonoAndroid10+MonoTouch10" />
+  <package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.1.1-beta2" targetFramework="portable-win+net45+sl50+wp80+MonoAndroid10+MonoTouch10" />
+  <package id="MvvmCross.HotTuna.StarterPack" version="3.1.1-beta2" targetFramework="portable-win+net45+sl50+wp80+MonoAndroid10+MonoTouch10" />
+  <package id="MvvmCross.PortableSupport" version="3.1.1-beta2" targetFramework="portable-win+net45+sl50+wp80+MonoAndroid10+MonoTouch10" />
 </packages>
diff --git a/N-24-Split/Splitter.Touch/AppDelegate.cs.txt b/N-24-Split/Splitter.Touch/AppDelegate.cs.txt
diff --git a/N-24-Split/Splitter.Touch/DebugTrace.cs b/N-24-Split/Splitter.Touch/DebugTrace.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Diagnostics;
+using Cirrious.CrossCore.Platform;
+
+namespace Splitter.Touch
+{
+    public class DebugTrace : IMvxTrace
+    {
+        public void Trace(MvxTraceLevel level, string tag, Func<string> message)
+        {
+            Debug.WriteLine(tag + ":" + level + ":" + message());
+        }
+
+        public void Trace(MvxTraceLevel level, string tag, string message)
+        {
+            Debug.WriteLine(tag + ":" + level + ":" + message);
+        }
+
+        public void Trace(MvxTraceLevel level, string tag, string message, params object[] args)
+        {
+            try
+            {
+                Debug.WriteLine(string.Format(tag + ":" + level + ":" + message, args));
+            }
+            catch (FormatException)
+            {
+                Trace(MvxTraceLevel.Error, tag, "Exception during trace of {0} {1} {2}", level, message);
+            }
+        }
+    }
+}
diff --git a/N-24-Split/Splitter.Touch/Info.plist b/N-24-Split/Splitter.Touch/Info.plist
@@ -1,26 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
-    <key>UIDeviceFamily</key>
-    <array>
-      <integer>1</integer>
-      <integer>2</integer>
-    </array>
-    <key>UISupportedInterfaceOrientations</key>
-    <array>
-      <string>UIInterfaceOrientationPortrait</string>
-      <string>UIInterfaceOrientationLandscapeLeft</string>
-      <string>UIInterfaceOrientationLandscapeRight</string>
-    </array>
-    <key>UISupportedInterfaceOrientations~ipad</key>
-    <array>
-      <string>UIInterfaceOrientationPortrait</string>
-      <string>UIInterfaceOrientationPortraitUpsideDown</string>
-      <string>UIInterfaceOrientationLandscapeLeft</string>
-      <string>UIInterfaceOrientationLandscapeRight</string>
-    </array>
-    <key>MinimumOSVersion</key>
-    <string>3.2</string>
-  </dict>
-</plist>
+<dict>
+	<key>UIDeviceFamily</key>
+	<array>
+		<integer>1</integer>
+		<integer>2</integer>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array/>
+	<key>MinimumOSVersion</key>
+	<string>3.2</string>
+	<key>CFBundleDisplayName</key>
+	<string>N-24-Split</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.mvvmcross.nequals24</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>NSMainNibFile</key>
+	<string></string>
+	<key>NSMainNibFile~ipad</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/N-24-Split/Splitter.Touch/LinkerPleaseInclude.cs b/N-24-Split/Splitter.Touch/LinkerPleaseInclude.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Specialized;
+using System.Windows.Input;
 using MonoTouch.UIKit;
 
 namespace Splitter.Touch
@@ -39,7 +40,7 @@ public void Include(UILabel label)
 
         public void Include(UIImageView imageView)
         {
-            imageView.Image = new UIImage(imageView.Image);
+            imageView.Image = new UIImage(imageView.Image.CGImage);
         }
 
         public void Include(UIDatePicker date)
@@ -64,5 +65,10 @@ public void Include(INotifyCollectionChanged changed)
         {
             changed.CollectionChanged += (s,e) => { var test = string.Format("{0}{1}{2}{3}{4}", e.Action,e.NewItems, e.NewStartingIndex, e.OldItems, e.OldStartingIndex); } ;
         }
-    }
+
+        public void Include(ICommand command)
+        {
+           command.CanExecuteChanged += (s, e) => { if (command.CanExecute(null)) command.Execute(null); };
+        }
+	}
 }
diff --git a/N-24-Split/Splitter.Touch/Splitter.Touch.csproj b/N-24-Split/Splitter.Touch/Splitter.Touch.csproj
@@ -10,7 +10,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Splitter.Touch</RootNamespace>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AssemblyName>Splitter.Touch</AssemblyName>
+    <AssemblyName>SplitterTouch</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -74,6 +74,7 @@
     <CodesignKey>iPhone Distribution</CodesignKey>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="DebugTrace.cs" />
     <Compile Include="LinkerPleaseInclude.cs" />
     <Compile Include="Main.cs" />
     <Compile Include="AppDelegate.cs" />
@@ -97,44 +98,31 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Cirrious.CrossCore">
-      <HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.7\lib\MonoTouch40\Cirrious.CrossCore.dll</HintPath>
+      <HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta2\lib\MonoTouch\Cirrious.CrossCore.dll</HintPath>
     </Reference>
     <Reference Include="Cirrious.CrossCore.Touch">
-      <HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.7\lib\MonoTouch40\Cirrious.CrossCore.Touch.dll</HintPath>
+      <HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta2\lib\MonoTouch\Cirrious.CrossCore.Touch.dll</HintPath>
     </Reference>
     <Reference Include="Cirrious.MvvmCross">
-      <HintPath>..\packages\MvvmCross.HotTuna.StarterPack.3.0.7\lib\MonoTouch40\Cirrious.MvvmCross.dll</HintPath>
+      <HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.1.1-beta2\lib\MonoTouch\Cirrious.MvvmCross.dll</HintPath>
     </Reference>
     <Reference Include="Cirrious.MvvmCross.Binding">
-      <HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.7\lib\MonoTouch40\Cirrious.MvvmCross.Binding.dll</HintPath>
+      <HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta2\lib\MonoTouch\Cirrious.MvvmCross.Binding.dll</HintPath>
     </Reference>
     <Reference Include="Cirrious.MvvmCross.Binding.Touch">
-      <HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.7\lib\MonoTouch40\Cirrious.MvvmCross.Binding.Touch.dll</HintPath>
+      <HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta2\lib\MonoTouch\Cirrious.MvvmCross.Binding.Touch.dll</HintPath>
     </Reference>
     <Reference Include="Cirrious.MvvmCross.Localization">
-      <HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.7\lib\MonoTouch40\Cirrious.MvvmCross.Localization.dll</HintPath>
+      <HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.1.1-beta2\lib\MonoTouch\Cirrious.MvvmCross.Localization.dll</HintPath>
     </Reference>
     <Reference Include="Cirrious.MvvmCross.Touch">
-      <HintPath>..\packages\MvvmCross.HotTuna.StarterPack.3.0.7\lib\MonoTouch40\Cirrious.MvvmCross.Touch.dll</HintPath>
+      <HintPath>..\packages\MvvmCross.HotTuna.MvvmCrossLibraries.3.1.1-beta2\lib\MonoTouch\Cirrious.MvvmCross.Touch.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Net, Version=2.0.5.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\MvvmCross.PortableSupport.3.0.7\lib\MonoTouch40\System.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows">
-      <HintPath>..\packages\MvvmCross.PortableSupport.3.0.7\lib\MonoTouch40\System.Windows.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Windows" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="monotouch" />
-    <Reference Include="System.Xml.Serialization">
-      <HintPath>..\packages\MvvmCross.PortableSupport.3.0.7\lib\MonoTouch40\System.Xml.Serialization.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="AppDelegate.cs.txt" />
-    <Content Include="ToDo-MvvmCross\_ Touch UI.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
 </Project>
diff --git a/N-24-Split/Splitter.Touch/Views/FirstView.cs b/N-24-Split/Splitter.Touch/Views/FirstView.cs
@@ -1,6 +1,7 @@
 using System.Drawing;
 using Cirrious.MvvmCross.Binding.BindingContext;
 using Cirrious.MvvmCross.Touch.Views;
+using MonoTouch.ObjCRuntime;
 using MonoTouch.UIKit;
 using MonoTouch.Foundation;
 
@@ -14,6 +15,10 @@ public override void ViewDidLoad()
             View = new UIView(){ BackgroundColor = UIColor.White};
             base.ViewDidLoad();
 
+            // ios7 layout
+            if (RespondsToSelector(new Selector("edgesForExtendedLayout")))
+                EdgesForExtendedLayout = UIRectEdge.None;
+
             var b1 = new UIButton(UIButtonType.RoundedRect);
             b1.Frame = new RectangleF(10, 10, 300, 40);
             b1.SetTitle("Blue", UIControlState.Normal);
@@ -37,6 +42,11 @@ public class RedView : MvxViewController
         public override void ViewDidLoad()
         {
             base.ViewDidLoad();
+
+            // ios7 layout
+            if (RespondsToSelector(new Selector("edgesForExtendedLayout")))
+                EdgesForExtendedLayout = UIRectEdge.None;
+
             View.BackgroundColor = UIColor.Red;
         }
     }
@@ -47,6 +57,11 @@ public class BlueView : MvxViewController
         public override void ViewDidLoad()
         {
             base.ViewDidLoad();
+
+            // ios7 layout
+            if (RespondsToSelector(new Selector("edgesForExtendedLayout")))
+                EdgesForExtendedLayout = UIRectEdge.None;
+
             View.BackgroundColor = UIColor.Blue;
         }
     }

diff --git a/N-24-Split/Splitter.Touch/packages.config b/N-24-Split/Splitter.Touch/packages.config
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MvvmCross" version="3.0.7" targetFramework="MonoTouch40" />
-  <package id="MvvmCross.HotTuna.CrossCore" version="3.0.7" targetFramework="MonoTouch40" />
-  <package id="MvvmCross.HotTuna.StarterPack" version="3.0.7" targetFramework="MonoTouch40" />
-  <package id="MvvmCross.PortableSupport" version="3.0.7" targetFramework="MonoTouch40" />
+  <package id="MvvmCross" version="3.1.1-beta2" targetFramework="MonoTouch10" />
+  <package id="MvvmCross.HotTuna.CrossCore" version="3.1.1-beta2" targetFramework="MonoTouch10" />
+  <package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.1.1-beta2" targetFramework="MonoTouch10" />
+  <package id="MvvmCross.HotTuna.StarterPack" version="3.1.1-beta2" targetFramework="MonoTouch10" />
+  <package id="MvvmCross.PortableSupport" version="3.1.1-beta2" targetFramework="MonoTouch10" />
 </packages>
diff --git a/N-24-Split/packages/MvvmCross.3.0.7/BootstrapContent/AccelerometerPluginBootstrap.cs.pp b/N-24-Split/packages/MvvmCross.3.0.7/BootstrapContent/AccelerometerPluginBootstrap.cs.pp
diff --git a/N-24-Split/packages/MvvmCross.3.0.7/BootstrapContent/BookmarksPluginBootstrap.cs.pp b/N-24-Split/packages/MvvmCross.3.0.7/BootstrapContent/BookmarksPluginBootstrap.cs.pp
diff --git a/N-24-Split/packages/MvvmCross.3.0.7/BootstrapContent/ColorPluginBootstrap.cs.pp b/N-24-Split/packages/MvvmCross.3.0.7/BootstrapContent/ColorPluginBootstrap.cs.pp
diff --git a/N-24-Split/packages/MvvmCross.3.0.7/BootstrapContent/DownloadCachePluginBootstrap.cs.pp b/N-24-Split/packages/MvvmCross.3.0.7/BootstrapContent/DownloadCachePluginBootstrap.cs.pp
diff --git a/N-24-Split/packages/MvvmCross.3.0.7/BootstrapContent/EmailPluginBootstrap.cs.pp b/N-24-Split/packages/MvvmCross.3.0.7/BootstrapContent/EmailPluginBootstrap.cs.pp