Skip to content

Commit

Permalink
N-38-Maps to 158,iOS7,3.1.1.-beta2
Browse files Browse the repository at this point in the history
  • Loading branch information
kstreet committed Jan 5, 2014
1 parent 31d6491 commit 5d0c9ad
Show file tree
Hide file tree
Showing 139 changed files with 333 additions and 142 deletions.
18 changes: 7 additions & 11 deletions N-38-Maps/Mappit.Core/Mappit.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<RootNamespace>Mappit.Core</RootNamespace>
<AssemblyName>Mappit.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>
Expand All @@ -32,10 +32,6 @@
<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" />
Expand All @@ -48,20 +44,20 @@
<Compile Include="ViewModels\Location.cs" />
<Compile Include="ViewModels\Zombie.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="Cirrious.CrossCore">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.13-beta1\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.MvvmCrossLibraries.3.0.13-beta1\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.13-beta1\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.
Expand Down
10 changes: 5 additions & 5 deletions N-38-Maps/Mappit.Core/packages.config
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.13-beta1" targetFramework="portable-win+net45+MonoAndroid16+MonoTouch40+sl40+wp71" />
<package id="MvvmCross.HotTuna.CrossCore" version="3.0.13-beta1" targetFramework="portable-win+net45+MonoAndroid16+MonoTouch40+sl40+wp71" />
<package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.0.13-beta1" targetFramework="portable-win+net45+MonoAndroid16+MonoTouch40+sl40+wp71" />
<package id="MvvmCross.HotTuna.StarterPack" version="3.0.13-beta1" targetFramework="portable-win+net45+MonoAndroid16+MonoTouch40+sl40+wp71" />
<package id="MvvmCross.PortableSupport" version="3.0.13-beta1" 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>
29 changes: 0 additions & 29 deletions N-38-Maps/Mappit.Touch/AppDelegate.cs.txt

This file was deleted.

40 changes: 24 additions & 16 deletions N-38-Maps/Mappit.Touch/Info.plist
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
<?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>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</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>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>MinimumOSVersion</key>
<string>3.2</string>
<key>CFBundleDisplayName</key>
<string>N-38-Maps</string>
<key>CFBundleIdentifier</key>
<string>com.mvvmcross.nequals38</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>NSMainNibFile</key>
<string></string>
</dict>
</plist>
16 changes: 7 additions & 9 deletions N-38-Maps/Mappit.Touch/Mappit.Touch.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -104,25 +104,25 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Cirrious.CrossCore">
<HintPath>..\packages\MvvmCross.HotTuna.CrossCore.3.0.13-beta1\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.13-beta1\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.MvvmCrossLibraries.3.0.13-beta1\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.13-beta1\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.13-beta1\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.13-beta1\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.MvvmCrossLibraries.3.0.13-beta1\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.Windows" />
Expand All @@ -131,8 +131,6 @@
<Reference Include="monotouch" />
</ItemGroup>
<ItemGroup>
<Content Include="AppDelegate.cs.txt" />
<Content Include="ToDo-MvvmCross\_ Touch UI.txt" />
<Content Include="zombie.png" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
Expand Down
5 changes: 5 additions & 0 deletions N-38-Maps/Mappit.Touch/Views/FifthView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using Mappit.Core.ViewModels;
using MonoTouch.CoreLocation;
using MonoTouch.MapKit;
using MonoTouch.ObjCRuntime;
using MonoTouch.UIKit;
using MonoTouch.Foundation;

Expand All @@ -20,6 +21,10 @@ public override void ViewDidLoad()

base.ViewDidLoad();

// ios7 layout
if (RespondsToSelector(new Selector("edgesForExtendedLayout")))
EdgesForExtendedLayout = UIRectEdge.None;

var regionManager = new RegionManager(mapView);
mapView.Delegate = regionManager;

Expand Down
5 changes: 5 additions & 0 deletions N-38-Maps/Mappit.Touch/Views/FirstView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Mappit.Core.ViewModels;
using MonoTouch.CoreLocation;
using MonoTouch.MapKit;
using MonoTouch.ObjCRuntime;
using MonoTouch.UIKit;
using MonoTouch.Foundation;

Expand All @@ -20,6 +21,10 @@ public override void ViewDidLoad()

base.ViewDidLoad();

// ios7 layout
if (RespondsToSelector(new Selector("edgesForExtendedLayout")))
EdgesForExtendedLayout = UIRectEdge.None;

var firstViewModel = (FirstViewModel) ViewModel;
var helenAnnotation = new ZombieAnnotation(firstViewModel.Helen);
var keithAnnotation = new ZombieAnnotation(firstViewModel.Keith);
Expand Down
5 changes: 5 additions & 0 deletions N-38-Maps/Mappit.Touch/Views/FourthView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Mappit.Core.ViewModels;
using MonoTouch.CoreLocation;
using MonoTouch.MapKit;
using MonoTouch.ObjCRuntime;
using MonoTouch.UIKit;
using MonoTouch.Foundation;

Expand All @@ -21,6 +22,10 @@ public override void ViewDidLoad()

base.ViewDidLoad();

// ios7 layout
if (RespondsToSelector(new Selector("edgesForExtendedLayout")))
EdgesForExtendedLayout = UIRectEdge.None;

var firstViewModel = (FourthViewModel)ViewModel;
_regionManager = new RegionManager(mapView);

Expand Down
5 changes: 5 additions & 0 deletions N-38-Maps/Mappit.Touch/Views/HomeView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Mappit.Core.ViewModels;
using MonoTouch.CoreLocation;
using MonoTouch.MapKit;
using MonoTouch.ObjCRuntime;
using MonoTouch.UIKit;
using MonoTouch.Foundation;

Expand All @@ -22,6 +23,10 @@ public override void ViewDidLoad()

base.ViewDidLoad();

// ios7 layout
if (RespondsToSelector(new Selector("edgesForExtendedLayout")))
EdgesForExtendedLayout = UIRectEdge.None;

var one = new UIButton(UIButtonType.RoundedRect);
one.Frame = new RectangleF(10, 10, 300, 40);
one.SetTitle("one", UIControlState.Normal);
Expand Down
5 changes: 5 additions & 0 deletions N-38-Maps/Mappit.Touch/Views/SecondView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using Mappit.Core.ViewModels;
using MonoTouch.CoreLocation;
using MonoTouch.MapKit;
using MonoTouch.ObjCRuntime;
using MonoTouch.UIKit;
using MonoTouch.Foundation;

Expand All @@ -21,6 +22,10 @@ public override void ViewDidLoad()

base.ViewDidLoad();

// ios7 layout
if (RespondsToSelector(new Selector("edgesForExtendedLayout")))
EdgesForExtendedLayout = UIRectEdge.None;

var secondViewModel = (SecondViewModel)ViewModel;
var hanAnnotation = new ZombieAnnotation(secondViewModel.Han);

Expand Down
5 changes: 5 additions & 0 deletions N-38-Maps/Mappit.Touch/Views/ThirdView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Mappit.Core.ViewModels;
using MonoTouch.CoreLocation;
using MonoTouch.MapKit;
using MonoTouch.ObjCRuntime;
using MonoTouch.UIKit;
using MonoTouch.Foundation;

Expand Down Expand Up @@ -39,6 +40,10 @@ public override void ViewDidLoad()

base.ViewDidLoad();

// ios7 layout
if (RespondsToSelector(new Selector("edgesForExtendedLayout")))
EdgesForExtendedLayout = UIRectEdge.None;

var thirdViewModel = (ThirdViewModel)ViewModel;
_zombieManager = new ZombieManager(mapView);

Expand Down
10 changes: 5 additions & 5 deletions N-38-Maps/Mappit.Touch/packages.config
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.13-beta1" targetFramework="MonoTouch40" />
<package id="MvvmCross.HotTuna.CrossCore" version="3.0.13-beta1" targetFramework="MonoTouch40" />
<package id="MvvmCross.HotTuna.MvvmCrossLibraries" version="3.0.13-beta1" targetFramework="MonoTouch40" />
<package id="MvvmCross.HotTuna.StarterPack" version="3.0.13-beta1" targetFramework="MonoTouch40" />
<package id="MvvmCross.PortableSupport" version="3.0.13-beta1" 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>
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>MvvmCross</id>
<version>3.0.13-beta1</version>
<version>3.1.1-beta2</version>
<title>MvvmCross</title>
<authors>MvvmCross</authors>
<owners>Stuart Lodge</owners>
<owners>MvvmCross</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package contains the 'Getting Started' assemblies for MvvmCross v3 - Hot Tuna. This and other packages are currently under development...</description>
<releaseNotes />
<copyright />
<language />
<dependencies>
<dependency id="MvvmCross.HotTuna.StarterPack" version="3.0.13-beta1" />
<dependency id="MvvmCross.HotTuna.StarterPack" version="3.1.1-beta2" />
</dependencies>
</metadata>
</package>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>MvvmCross.HotTuna.CrossCore</id>
<version>3.0.13-beta1</version>
<version>3.1.1-beta2</version>
<title>MvvmCross - CrossCore</title>
<authors>MvvmCross</authors>
<owners>Stuart Lodge</owners>
<owners>MvvmCross</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package contains the 'Core' assemblies for MvvmCross v3 - Hot Tuna. This and other packages are currently under development...</description>
<dependencies>
<dependency id="MvvmCross.PortableSupport" version="3.0.13-beta1" />
<dependency id="MvvmCross.PortableSupport" version="3.1.1-beta2" />
</dependencies>
</metadata>
</package>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>MvvmCross.HotTuna.MvvmCrossLibraries</id>
<version>3.0.13-beta1</version>
<version>3.1.1-beta2</version>
<title>MvvmCross - Hot Tuna MvvmCross Libraries</title>
<authors>MvvmCross</authors>
<owners>Stuart Lodge</owners>
<owners>MvvmCross</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>This package contains the 'MvvmCross Library' assemblies for MvvmCross v3 - Hot Tuna. This and other packages are currently under development...</description>
<dependencies>
<dependency id="MvvmCross.HotTuna.CrossCore" version="3.0.13-beta1" />
<dependency id="MvvmCross.HotTuna.CrossCore" version="3.1.1-beta2" />
</dependencies>
</metadata>
</package>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Loading

0 comments on commit 5d0c9ad

Please sign in to comment.