jsuarezruiz
/
oxyplot-xamarin
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #51 from objorke/misc 

Update to latest OxyPlot
This commit is contained in:
Oystein Bjorke 2017-01-08 18:37:16 +01:00 коммит произвёл GitHub
Родитель 49ab9a428e b2d5aca0a0
Коммит b202093e02
63 изменённых файлов: 210 добавлений и 783 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
CHANGELOG.md
Просмотреть файл

@ -4,7 +4,10 @@ All notable changes to this project will be documented in this file.
## [Unreleased]
### Changed
- OxyPlot.Xamarin.Android targets latest platform
- OxyPlot.Xamarin.Android targets latest Android platform
### Removed
- OxyPlot.MonoTouch (#50)
## 1.0.0 - 2017-01-08
### Added

95
Source/Examples/MonoTouch/ExampleBrowser/AppDelegate.cs
Просмотреть файл

@ -1,95 +0,0 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="AppDelegate.cs" company="OxyPlot">
// Copyright (c) 2014 OxyPlot contributors
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
namespace ExampleBrowser
{
using System;
using System.Collections.Generic;
using System.Linq;
using MonoTouch.Foundation;
using MonoTouch.UIKit;
using MonoTouch.Dialog;
using ExampleLibrary;
// The UIApplicationDelegate for the application. This class is responsible for launching the
// User Interface of the application, as well as listening (and optionally responding) to
// application events from iOS.
[Register ("AppDelegate")]
public partial class AppDelegate : UIApplicationDelegate
{
// class-level declarations
UIWindow window;
UINavigationController navigation;
List<ExampleInfo> exampleInfoList;
//
// This method is invoked when the application has loaded and is ready to run. In this
// method you should instantiate the window, load the UI into it and then make the window
// visible.
//
// You have 17 seconds to return from this method, or iOS will terminate your application.
//
public override bool FinishedLaunching (UIApplication app, NSDictionary options)
{
exampleInfoList = ExampleLibrary.Examples.GetList();
// create a new window instance based on the screen size
window = new UIWindow (UIScreen.MainScreen.Bounds);
navigation = new UINavigationController();
var root = new RootElement ("OxyPlot Example Browser");
var section = new Section ();
section.AddAll (exampleInfoList
.GroupBy (e => e.Category)
.OrderBy (g => g.Key)
.Select (g =>
(Element)new StyledStringElement (g.Key, delegate {
DisplayCategory (g.Key);
}) { Accessory = UITableViewCellAccessory.DisclosureIndicator }));
root.Add (section);
var dvc = new DialogViewController (root, true);
navigation.PushViewController(dvc, true);
window.RootViewController = navigation;
// make the window visible
window.MakeKeyAndVisible ();
return true;
}
private void DisplayCategory(string category)
{
var root = new RootElement (category);
var section = new Section ();
section.AddAll (exampleInfoList
.Where (e => e.Category == category)
.OrderBy (e => e.Title)
.Select (e => (Element)new StyledStringElement (e.Title, delegate {
GraphView (e);
}) { Accessory = UITableViewCellAccessory.DisclosureIndicator }
));
root.Add (section);
var dvc = new DialogViewController (root, true);
navigation.PushViewController (dvc, true);
}
private void GraphView(ExampleInfo exampleInfo)
{
var dvc = new GraphViewController (exampleInfo);
navigation.PushViewController (dvc, true);
}
}
}

155
Source/Examples/MonoTouch/ExampleBrowser/ExampleBrowser.csproj
Просмотреть файл

@ -1,155 +0,0 @@
<?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>{8A7939AC-BAC2-4CFB-B429-DB92F106700C}</ProjectGuid>
<ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Exe</OutputType>
<RootNamespace>ExampleBrowser</RootNamespace>
<AssemblyName>ExampleBrowser</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<MtouchLink>None</MtouchLink>
<MtouchDebug>true</MtouchDebug>
<MtouchArch>ARMv7</MtouchArch>
<MtouchI18n>
</MtouchI18n>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\iPhoneSimulator\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<MtouchLink>None</MtouchLink>
</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>
<IpaPackageName>
</IpaPackageName>
<MtouchI18n>
</MtouchI18n>
<BuildIpa>true</BuildIpa>
<MtouchArch>ARMv7</MtouchArch>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\iPhone\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<CodesignKey>iPhone Developer</CodesignKey>
<BuildIpa>true</BuildIpa>
<IpaPackageName>
</IpaPackageName>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="monotouch" />
<Reference Include="MonoTouch.Dialog-1" />
</ItemGroup>
<ItemGroup>
<None Include="Info.plist" />
</ItemGroup>
<ItemGroup>
<Compile Include="Main.cs" />
<Compile Include="AppDelegate.cs" />
<Compile Include="GraphViewController.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\..\..\OxyPlot.MonoTouch\OxyPlot.MonoTouch.csproj">
<Project>{7dcf07b1-b8bd-4ef0-b1fc-2aac4466b6c6}</Project>
<Name>OxyPlot.MonoTouch</Name>
<IsAppExtension>false</IsAppExtension>
</ProjectReference>
<ProjectReference Include="..\..\..\OxyPlot\OxyPlot.csproj">
<Project>{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}</Project>
<Name>OxyPlot</Name>
</ProjectReference>
<ProjectReference Include="..\..\ExampleLibrary\ExampleLibrary.csproj">
<Project>{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}</Project>
<Name>ExampleLibrary</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<BundleResource Include="..\..\..\..\Icons\OxyPlot_57.png">
<Link>Images\OxyPlot_57.png</Link>
</BundleResource>
<BundleResource Include="..\..\..\..\Icons\OxyPlot_114.png">
<Link>Images\OxyPlot_114.png</Link>
</BundleResource>
<BundleResource Include="..\..\..\..\Icons\OxyPlot_72.png">
<Link>Images\OxyPlot_72.png</Link>
</BundleResource>
<BundleResource Include="..\..\..\..\Icons\OxyPlot_76.png">
<Link>Images\OxyPlot_76.png</Link>
</BundleResource>
<BundleResource Include="..\..\..\..\Icons\OxyPlot_120.png">
<Link>Images\OxyPlot_120.png</Link>
</BundleResource>
<BundleResource Include="..\..\..\..\Icons\OxyPlot_144.png">
<Link>Images\OxyPlot_144.png</Link>
</BundleResource>
<BundleResource Include="..\..\..\..\Icons\OxyPlot_152.png">
<Link>Images\OxyPlot_152.png</Link>
</BundleResource>
<BundleResource Include="..\..\..\..\Icons\OxyPlot_29.png">
<Link>Images\OxyPlot_29.png</Link>
</BundleResource>
<BundleResource Include="..\..\..\..\Icons\OxyPlot_40.png">
<Link>Images\OxyPlot_40.png</Link>
</BundleResource>
<BundleResource Include="..\..\..\..\Icons\OxyPlot_50.png">
<Link>Images\OxyPlot_50.png</Link>
</BundleResource>
<BundleResource Include="..\..\..\..\Icons\OxyPlot_58.png">
<Link>Images\OxyPlot_58.png</Link>
</BundleResource>
<BundleResource Include="..\..\..\..\Icons\OxyPlot_80.png">
<Link>Images\OxyPlot_80.png</Link>
</BundleResource>
<BundleResource Include="..\..\..\..\Icons\OxyPlot_100.png">
<Link>Images\OxyPlot_100.png</Link>
</BundleResource>
<BundleResource Include="Images\ExampleBrowser_320x480.png" />
<BundleResource Include="Images\ExampleBrowser_640x960.png" />
<BundleResource Include="Images\ExampleBrowser_640x1136.png" />
<BundleResource Include="Images\ExampleBrowser_768x1004.png" />
<BundleResource Include="Images\ExampleBrowser_1024x748.png" />
<BundleResource Include="Images\ExampleBrowser_1536x2008.png" />
<BundleResource Include="Images\ExampleBrowser_2048x1496.png" />
<BundleResource Include="Resources\Default-568h%402x.png" />
<BundleResource Include="Resources\Default.png" />
<BundleResource Include="Resources\Default%402x.png" />
<BundleResource Include="Resources\Default-Portrait.png" />
<BundleResource Include="Resources\Default-Landscape.png" />
<BundleResource Include="Resources\Default-Portrait%402x.png" />
<BundleResource Include="Resources\Default-Landscape%402x.png" />
</ItemGroup>
</Project>

119
Source/Examples/MonoTouch/ExampleBrowser/GraphViewController.cs
Просмотреть файл

@ -1,119 +0,0 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="GraphViewController.cs" company="OxyPlot">
// Copyright (c) 2014 OxyPlot contributors
// </copyright>
// <summary>
// Handles device orientation changes.
// </summary>
// --------------------------------------------------------------------------------------------------------------------
namespace ExampleBrowser
{
using System.Drawing;
using ExampleLibrary;
using MonoTouch.Foundation;
using MonoTouch.MessageUI;
using MonoTouch.UIKit;
using OxyPlot.MonoTouch;
public class GraphViewController : UIViewController
{
private readonly ExampleInfo exampleInfo;
private PlotView plotView;
public GraphViewController(ExampleInfo exampleInfo)
{
this.exampleInfo = exampleInfo;
this.plotView = new PlotView();
this.plotView.Model = exampleInfo.PlotModel;
}
public override void LoadView()
{
NavigationItem.RightBarButtonItem = new UIBarButtonItem(UIBarButtonSystemItem.Compose,
delegate
{
var actionSheet = new UIActionSheet("Email", null, "Cancel", "PNG", "PDF")
{
Style = UIActionSheetStyle.Default
};
actionSheet.Clicked += delegate(object sender, UIButtonEventArgs args)
{
if (args.ButtonIndex > 1)
return;
Email(args.ButtonIndex == 0 ? "png" : "pdf");
};
actionSheet.ShowInView(View);
});
// Only for iOS 7 and later?
this.EdgesForExtendedLayout = UIRectEdge.None;
this.View = this.plotView;
}
/// <summary>
/// Handles device orientation changes.
/// </summary>
/// <param name="fromInterfaceOrientation">The previous interface orientation.</param>
public override void DidRotate(UIInterfaceOrientation fromInterfaceOrientation)
{
base.DidRotate(fromInterfaceOrientation);
this.plotView.InvalidatePlot(false);
}
private void Email(string exportType)
{
if (!MFMailComposeViewController.CanSendMail)
return;
var title = exampleInfo.Title + "." + exportType;
NSData nsData = null;
string attachmentType = "text/plain";
var rect = new RectangleF(0, 0, 800, 600);
switch (exportType)
{
case "png":
nsData = View.ToPng(rect);
attachmentType = "image/png";
break;
case "pdf":
nsData = View.ToPdf(rect);
attachmentType = "text/x-pdf";
break;
}
var mail = new MFMailComposeViewController();
mail.SetSubject("OxyPlot - " + title);
mail.SetMessageBody("Please find attached " + title, false);
mail.Finished += HandleMailFinished;
mail.AddAttachmentData(nsData, attachmentType, title);
this.PresentViewController(mail, true, null);
}
private void HandleMailFinished(object sender, MFComposeResultEventArgs e)
{
if (e.Result == MFMailComposeResult.Sent)
{
UIAlertView alert = new UIAlertView("Mail Alert", "Mail Sent",
null, "Yippie", null);
alert.Show();
// you should handle other values that could be returned
// in e.Result and also in e.Error
}
e.Controller.DismissViewController(true, null);
}
}
}

Двоичные данные
Source/Examples/MonoTouch/ExampleBrowser/Images/ExampleBrowser_1024x748.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 16 KiB

Двоичные данные
Source/Examples/MonoTouch/ExampleBrowser/Images/ExampleBrowser_1536x2008.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 34 KiB

Двоичные данные
Source/Examples/MonoTouch/ExampleBrowser/Images/ExampleBrowser_2048x1496.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 34 KiB

Двоичные данные
Source/Examples/MonoTouch/ExampleBrowser/Images/ExampleBrowser_320x480.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 7.2 KiB

Двоичные данные
Source/Examples/MonoTouch/ExampleBrowser/Images/ExampleBrowser_640x1136.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 15 KiB

Двоичные данные
Source/Examples/MonoTouch/ExampleBrowser/Images/ExampleBrowser_640x960.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 15 KiB

Двоичные данные
Source/Examples/MonoTouch/ExampleBrowser/Images/ExampleBrowser_768x1004.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 15 KiB

40
Source/Examples/MonoTouch/ExampleBrowser/Info.plist
Просмотреть файл

@ -1,40 +0,0 @@
<?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>CFBundleDisplayName</key>
<string>Example Browser</string>
<key>CFBundleIconFiles</key>
<array>
<string>Images/OxyPlot_57</string>
<string>Images/OxyPlot_114</string>
<string>Images/OxyPlot_72</string>
<string>Images/OxyPlot_29</string>
<string>Images/OxyPlot_58</string>
<string>Images/OxyPlot_50</string>
<string>Images/OxyPlot_120</string>
<string>Images/OxyPlot_144</string>
<string>Images/OxyPlot_76</string>
<string>Images/OxyPlot_152</string>
<string>Images/OxyPlot_100</string>
<string>Images/OxyPlot_40</string>
<string>Images/OxyPlot_80</string>
</array>
<key>CFBundleVersion</key>
<string>1.3.0</string>
<key>MinimumOSVersion</key>
<string>5.0</string>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
<integer>2</integer>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>

21
Source/Examples/MonoTouch/ExampleBrowser/Main.cs
Просмотреть файл

@ -1,21 +0,0 @@
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="Main.cs" company="OxyPlot">
// Copyright (c) 2014 OxyPlot contributors
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
namespace ExampleBrowser
{
using MonoTouch.UIKit;
public class Application
{
// This is the main entry point of the application.
static void Main(string[] args)
{
// if you want to use a different Application Delegate class from "AppDelegate"
// you can specify it here.
UIApplication.Main(args, null, "AppDelegate");
}
}
}

Двоичные данные
Source/Examples/MonoTouch/ExampleBrowser/Resources/Default-568h@2x.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 15 KiB

Двоичные данные
Source/Examples/MonoTouch/ExampleBrowser/Resources/Default-Landscape.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 16 KiB

Двоичные данные
Source/Examples/MonoTouch/ExampleBrowser/Resources/Default-Landscape@2x.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 34 KiB

Двоичные данные
Source/Examples/MonoTouch/ExampleBrowser/Resources/Default-Portrait.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 15 KiB

Двоичные данные
Source/Examples/MonoTouch/ExampleBrowser/Resources/Default-Portrait@2x.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 34 KiB

Двоичные данные
Source/Examples/MonoTouch/ExampleBrowser/Resources/Default.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 7.2 KiB

Двоичные данные
Source/Examples/MonoTouch/ExampleBrowser/Resources/Default@2x.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 15 KiB

19
Source/Examples/Xamarin.Android/ExampleBrowser/Assets/AboutAssets.txt
Просмотреть файл

@ -1,19 +0,0 @@
Any raw assets you want to be deployed with your application can be placed in
this directory (and child directories) and given a Build Action of "AndroidAsset".
These files will be deployed with you package and will be accessible using Android's
AssetManager, like this:
public class ReadAsset : Activity
{
protected override void OnCreate (Bundle bundle)
{
base.OnCreate (bundle);
InputStream input = Assets.Open ("my_asset.txt");
}
}
Additionally, some Android functions will automatically load asset files:
Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");

24
Source/Examples/Xamarin.Android/ExampleBrowser/CategoryListActivity.cs
Просмотреть файл

@ -4,15 +4,15 @@
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
using System.Linq;
using Android.App;
using Android.Content;
using Android.OS;
using Android.Widget;
namespace ExampleBrowser
{
using System.Linq;
using Android.App;
using Android.Content;
using Android.OS;
using Android.Widget;
[Activity(Label = "OxyPlot Example Browser", MainLauncher = true, Icon = "@drawable/icon")]
public class CategoryListActivity : ListActivity
{
@ -21,16 +21,16 @@ namespace ExampleBrowser
base.OnCreate(bundle);
this.Title = "OxyPlot Example Browser";
var examples=ExampleLibrary.Examples.GetList();
var examples = ExampleLibrary.Examples.GetList();
var categories = examples.Select(e => e.Category).Distinct().OrderBy(s => s).ToList();
ListAdapter = new ArrayAdapter<string>(this, Resource.Layout.ListItem, categories);
ListView.TextFilterEnabled = true;
ListView.ItemClick += delegate(object sender, AdapterView.ItemClickEventArgs args)
this.ListAdapter = new ArrayAdapter<string>(this, Resource.Layout.ListItem, categories);
this.ListView.TextFilterEnabled = true;
this.ListView.ItemClick += delegate (object sender, AdapterView.ItemClickEventArgs args)
{
var category = categories[args.Position];
var second = new Intent(this, typeof(ExampleListActivity));
second.PutExtra("category", category);
StartActivity(second);
this.StartActivity(second);
};
}
}

24
Source/Examples/Xamarin.Android/ExampleBrowser/ExampleBrowser.csproj
Просмотреть файл

@ -19,8 +19,8 @@
<DeployExternal>True</DeployExternal>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
@ -43,8 +43,16 @@
<AndroidSupportedAbis>armeabi;armeabi-v7a;x86</AndroidSupportedAbis>
</PropertyGroup>
<ItemGroup>
<Reference Include="ExampleLibrary, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d3c5cdfc68b1b462, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\OxyPlot.ExampleLibrary.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\ExampleLibrary.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.Android" />
<Reference Include="mscorlib" />
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@ -61,12 +69,8 @@
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
<None Include="Assets\AboutAssets.txt" />
<None Include="packages.config" />
<AndroidResource Include="Resources\Layout\ListItem.axml" />
<AndroidResource Include="..\..\..\..\Icons\OxyPlot_72.png">
<Link>Resources\Drawable\icon.png</Link>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\Layout\PlotActivity.axml" />
@ -81,7 +85,11 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Properties\AndroidManifest.xml" />
<None Include="Properties\AndroidManifest.xml" />
<AndroidResource Include="Resources\Drawable\icon.png" />
</ItemGroup>
<ItemGroup>
<Folder Include="Assets\" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

26
Source/Examples/Xamarin.Android/ExampleBrowser/ExampleListActivity.cs
Просмотреть файл

@ -4,37 +4,37 @@
// </copyright>
// --------------------------------------------------------------------------------------------------------------------
using System.Linq;
using Android.App;
using Android.Content;
using Android.OS;
using Android.Widget;
namespace ExampleBrowser
{
using System.Linq;
using Android.App;
using Android.Content;
using Android.OS;
using Android.Widget;
[Activity(Label = "Example list", Icon = "@drawable/icon")]
public class ExampleListActivity : ListActivity
{
protected override void OnCreate(Bundle bundle)
{
base.OnCreate(bundle);
var category = Intent.GetStringExtra("category");
var category = this.Intent.GetStringExtra("category");
this.Title = category;
var examples = ExampleLibrary.Examples.GetList();
var plots = examples.Where(e => e.Category == category).Select(e => e.Title).OrderBy(s => s).ToList();
ListAdapter = new ArrayAdapter<string>(this, Resource.Layout.ListItem, plots);
ListView.TextFilterEnabled = true;
ListView.ItemClick += delegate(object sender, AdapterView.ItemClickEventArgs args)
this.ListAdapter = new ArrayAdapter<string>(this, Resource.Layout.ListItem, plots);
this.ListView.TextFilterEnabled = true;
this.ListView.ItemClick += delegate (object sender, AdapterView.ItemClickEventArgs args)
{
// When clicked, show a toast with the TextView text
Toast.MakeText(Application, ((TextView)args.View).Text, ToastLength.Short).Show();
Toast.MakeText(this.Application, ((TextView)args.View).Text, ToastLength.Short).Show();
var second = new Intent(this, typeof(PlotActivity));
second.PutExtra("category", category);
second.PutExtra("plot", plots[args.Position]);
StartActivity(second);
this.StartActivity(second);
};
}
}

13
Source/Examples/Xamarin.Android/ExampleBrowser/PlotActivity.cs
Просмотреть файл

@ -26,13 +26,18 @@ namespace ExampleBrowser
var category = this.Intent.GetStringExtra("category");
var plot = this.Intent.GetStringExtra("plot");
var exampleInfo = ExampleLibrary.Examples.GetList().FirstOrDefault(ei => ei.Category == category && ei.Title == plot);
var model = exampleInfo.PlotModel;
this.Title = exampleInfo.Title;
this.SetContentView(Resource.Layout.PlotActivity);
var plotView = this.FindViewById<PlotView>(Resource.Id.plotview);
plotView.Model = model;
var exampleInfo = ExampleLibrary.Examples.GetList().FirstOrDefault(ei => ei.Category == category && ei.Title == plot);
if (exampleInfo != null)
{
var model = exampleInfo.PlotModel;
this.Title = exampleInfo.Title;
plotView.Model = model;
}
}
}
}

2
Source/Examples/Xamarin.Android/ExampleBrowser/Properties/AndroidManifest.xml
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="preferExternal" android:versionName="Alpha" package="OxyPlot" android:versionCode="1">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="preferExternal" android:versionName="Alpha" package="OxyPlot.OxyPlot" android:versionCode="1">
<application android:label="OxyPlot Example Browser" android:icon="@drawable/icon"></application>
<uses-sdk />
<uses-permission android:name="android.permission.INTERNET" />

2
Source/Examples/Xamarin.Android/ExampleBrowser/Properties/AssemblyDescription.cs
Просмотреть файл

@ -5,8 +5,6 @@
// --------------------------------------------------------------------------------------------------------------------
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Android.App;
[assembly: AssemblyTitle("OxyPlot ExampleBrowser")]

44
Source/Examples/Xamarin.Android/ExampleBrowser/Resources/AboutResources.txt
Просмотреть файл

@ -1,44 +0,0 @@
Images, layout descriptions, binary blobs and string dictionaries can be included
in your application as resource files. Various Android APIs are designed to
operate on the resource IDs instead of dealing with images, strings or binary blobs
directly.
For example, a sample Android app that contains a user interface layout (Main.xml),
an internationalization string table (Strings.xml) and some icons (drawable/Icon.png)
would keep its resources in the "Resources" directory of the application:
Resources/
Drawable/
Icon.png
Layout/
Main.axml
Values/
Strings.xml
In order to get the build system to recognize Android resources, the build action should be set
to "AndroidResource". The native Android APIs do not operate directly with filenames, but
instead operate on resource IDs. When you compile an Android application that uses resources,
the build system will package the resources for distribution and generate a class called
"Resource" that contains the tokens for each one of the resources included. For example,
for the above Resources layout, this is what the Resource class would expose:
public class Resource {
public class Drawable {
public const int Icon = 0x123;
}
public class Layout {
public const int Main = 0x456;
}
public class String {
public const int FirstString = 0xabc;
public const int SecondString = 0xbcd;
}
}
You would then use Resource.Drawable.Icon to reference the Drawable/Icon.png file, or
Resource.Layout.Main to reference the Layout/Main.axml file, or Resource.String.FirstString
to reference the first string in the dictionary file Values/Strings.xml.

Двоичные данные
Source/Examples/Xamarin.Android/ExampleBrowser/Resources/Drawable/icon.png Normal file
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

После

Ширина:  |  Высота:  |  Размер: 2.1 KiB

2
Source/Examples/Xamarin.Android/ExampleBrowser/Resources/Resource.Designer.cs сгенерированный
Просмотреть файл

@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34209
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.

5
Source/Examples/Xamarin.Android/ExampleBrowser/packages.config Normal file
Просмотреть файл

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="monoandroid403" />
<package id="OxyPlot.ExampleLibrary" version="2.0.0-unstable0956" targetFramework="monoandroid403" />
</packages>

1
Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo.Droid/MainActivity.cs
Просмотреть файл

@ -20,6 +20,7 @@ namespace SimpleDemo.Droid
base.OnCreate(bundle);
global::Xamarin.Forms.Forms.Init(this, bundle);
OxyPlot.Xamarin.Forms.Platform.Android.PlotViewRenderer.Init();
LoadApplication(new App());
}
}

4
Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo.Droid/SimpleDemo.Droid.csproj
Просмотреть файл

@ -133,6 +133,10 @@
<AndroidResource Include="Resources\values\styles.xml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\OxyPlot.Xamarin.Forms.Platform.Android\OxyPlot.Xamarin.Forms.Platform.Android.csproj">
<Project>{a40ad708-3ff5-42fc-92b0-8d93ff1db58f}</Project>
<Name>OxyPlot.Xamarin.Forms.Platform.Android</Name>
</ProjectReference>
<ProjectReference Include="..\SimpleDemo\SimpleDemo.csproj">
<Project>{7f63f896-92ca-4b3d-b61d-de628dba7cf9}</Project>
<Name>SimpleDemo</Name>

1
Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo.UWP/project.json
Просмотреть файл

@ -1,6 +1,7 @@
{
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
"OxyPlot.Windows": "2.0.0-unstable0956",
"Xamarin.Forms": "2.3.3.180"
},
"frameworks": {

1
Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo.iOS/AppDelegate.cs
Просмотреть файл

@ -23,6 +23,7 @@ namespace SimpleDemo.iOS
public override bool FinishedLaunching(UIApplication app, NSDictionary options)
{
global::Xamarin.Forms.Forms.Init();
OxyPlot.Xamarin.Forms.Platform.iOS.PlotViewRenderer.Init();
LoadApplication(new App());
return base.FinishedLaunching(app, options);

6
Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo.iOS/SimpleDemo.iOS.csproj
Просмотреть файл

@ -138,6 +138,12 @@
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\OxyPlot.Xamarin.Forms.Platform.iOS\OxyPlot.Xamarin.Forms.Platform.iOS.csproj">
<Project>{6b6e500b-b75c-4a27-a73e-9f4de5fe6ed3}</Project>
<Name>OxyPlot.Xamarin.Forms.Platform.iOS</Name>
<IsAppExtension>false</IsAppExtension>
<IsWatchApp>false</IsWatchApp>
</ProjectReference>
<ProjectReference Include="..\SimpleDemo\SimpleDemo.csproj">
<Project>{7f63f896-92ca-4b3d-b61d-de628dba7cf9}</Project>
<Name>SimpleDemo</Name>

4
Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo/SimpleDemo.csproj
Просмотреть файл

@ -45,8 +45,8 @@
</None>
</ItemGroup>
<ItemGroup>
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\OxyPlot.Core.1.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">

2
Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="OxyPlot.Core" version="1.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="Xamarin.Forms" version="2.3.3.180" targetFramework="portable45-net45+win8+wp8+wpa81" />
</packages>

9
Source/Examples/Xamarin.iOS/ExampleBrowser/ExampleBrowser.csproj
Просмотреть файл

@ -67,6 +67,14 @@
</IpaPackageName>
</PropertyGroup>
<ItemGroup>
<Reference Include="ExampleLibrary, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d3c5cdfc68b1b462, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\OxyPlot.ExampleLibrary.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\ExampleLibrary.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
@ -75,6 +83,7 @@
</ItemGroup>
<ItemGroup>
<None Include="Info.plist" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Compile Include="Main.cs" />

63
Source/Examples/Xamarin.iOS/ExampleBrowser/GraphViewController.cs
Просмотреть файл

@ -24,18 +24,17 @@ namespace ExampleBrowser
{
private readonly ExampleInfo exampleInfo;
private PlotView plotView;
private readonly PlotView plotView;
public GraphViewController(ExampleInfo exampleInfo)
{
this.exampleInfo = exampleInfo;
this.plotView = new PlotView();
this.plotView.Model = exampleInfo.PlotModel;
this.plotView = new PlotView { Model = exampleInfo.PlotModel };
}
public override void LoadView()
{
NavigationItem.RightBarButtonItem = new UIBarButtonItem(UIBarButtonSystemItem.Compose);
this.NavigationItem.RightBarButtonItem = new UIBarButtonItem(UIBarButtonSystemItem.Compose);
// Only for iOS 7 and later?
this.EdgesForExtendedLayout = UIRectEdge.None;
@ -43,19 +42,19 @@ namespace ExampleBrowser
this.View = this.plotView;
}
public override void ViewDidAppear (bool animated)
{
base.ViewDidAppear (animated);
public override void ViewDidAppear(bool animated)
{
base.ViewDidAppear(animated);
NavigationItem.RightBarButtonItem.Clicked += HandleEmailButton;
}
this.NavigationItem.RightBarButtonItem.Clicked += this.HandleEmailButton;
}
public override void ViewDidDisappear (bool animated)
{
base.ViewDidDisappear (animated);
public override void ViewDidDisappear(bool animated)
{
base.ViewDidDisappear(animated);
NavigationItem.RightBarButtonItem.Clicked -= HandleEmailButton;
}
this.NavigationItem.RightBarButtonItem.Clicked -= this.HandleEmailButton;
}
/// <summary>
/// Handles device orientation changes.
@ -67,41 +66,41 @@ namespace ExampleBrowser
this.plotView.InvalidatePlot(false);
}
private void HandleEmailButton(object sender, EventArgs args)
{
var actionSheet = new UIActionSheet("Email", null, "Cancel", "PNG", "PDF")
{
Style = UIActionSheetStyle.Default
};
private void HandleEmailButton(object sender, EventArgs args)
{
var actionSheet = new UIActionSheet("Email", null, "Cancel", "PNG", "PDF")
{
Style = UIActionSheetStyle.Default
};
actionSheet.Clicked += (s, e) =>
{
if (e.ButtonIndex > 1)
return;
actionSheet.Clicked += (s, e) =>
{
if (e.ButtonIndex > 1)
return;
Email(e.ButtonIndex == 0 ? "png" : "pdf");
};
this.Email(e.ButtonIndex == 0 ? "png" : "pdf");
};
actionSheet.ShowInView(View);
}
actionSheet.ShowInView(View);
}
private void Email(string exportType)
{
if (!MFMailComposeViewController.CanSendMail)
return;
var title = exampleInfo.Title + "." + exportType;
var title = this.exampleInfo.Title + "." + exportType;
NSData nsData = null;
string attachmentType = "text/plain";
var rect = new CGRect(0, 0, 800, 600);
switch (exportType)
{
case "png":
nsData = View.ToPng(rect);
nsData = this.View.ToPng(rect);
attachmentType = "image/png";
break;
case "pdf":
nsData = View.ToPdf(rect);
nsData = this.View.ToPdf(rect);
attachmentType = "text/x-pdf";
break;
}
@ -109,7 +108,7 @@ namespace ExampleBrowser
var mail = new MFMailComposeViewController();
mail.SetSubject("OxyPlot - " + title);
mail.SetMessageBody("Please find attached " + title, false);
mail.Finished += HandleMailFinished;
mail.Finished += this.HandleMailFinished;
mail.AddAttachmentData(nsData, attachmentType, title);
this.PresentViewController(mail, true, null);

6
Source/Examples/Xamarin.iOS/ExampleBrowser/Main.cs
Просмотреть файл

@ -6,16 +6,16 @@
namespace ExampleBrowser
{
using UIKit;
using UIKit;
public class Application
{
// This is the main entry point of the application.
static void Main (string[] args)
static void Main(string[] args)
{
// if you want to use a different Application Delegate class from "AppDelegate"
// you can specify it here.
UIApplication.Main (args, null, "AppDelegate");
UIApplication.Main(args, null, "AppDelegate");
}
}
}

5
Source/Examples/Xamarin.iOS/ExampleBrowser/packages.config Normal file
Просмотреть файл

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="xamarinios10" />
<package id="OxyPlot.ExampleLibrary" version="2.0.0-unstable0956" targetFramework="xamarinios10" />
</packages>

2
Source/OxyPlot.MonoMac/OxyPlot.MonoMac.nuspec
Просмотреть файл

@ -12,7 +12,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<tags>xamarin mac monomac unified-api plotting plot charting chart</tags>
<dependencies>
<dependency id="OxyPlot.Core" version="1.0.0"/>
<dependency id="OxyPlot.Core" version="2.0.0-unstable0956"/>
</dependencies>
</metadata>
<files>

131
Source/OxyPlot.MonoTouch.sln
Просмотреть файл

@ -1,131 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxyPlot.MonoTouch", "OxyPlot.MonoTouch\OxyPlot.MonoTouch.csproj", "{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxyPlot", "OxyPlot\OxyPlot.csproj", "{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{0AB67A65-9645-4DF6-98A2-D5734D212E7C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleBrowser", "Examples\MonoTouch\ExampleBrowser\ExampleBrowser.csproj", "{8A7939AC-BAC2-4CFB-B429-DB92F106700C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleLibrary", "Examples\ExampleLibrary\ExampleLibrary.csproj", "{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
Ad-Hoc|iPhone = Ad-Hoc|iPhone
Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
AppStore|Any CPU = AppStore|Any CPU
AppStore|iPhone = AppStore|iPhone
AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
Debug|Any CPU = Debug|Any CPU
Debug|iPhone = Debug|iPhone
Debug|iPhoneSimulator = Debug|iPhoneSimulator
Release|Any CPU = Release|Any CPU
Release|iPhone = Release|iPhone
Release|iPhoneSimulator = Release|iPhoneSimulator
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.AppStore|Any CPU.Build.0 = Release|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.AppStore|iPhone.Build.0 = Debug|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Debug|iPhone.Build.0 = Debug|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Release|Any CPU.Build.0 = Release|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Release|iPhone.ActiveCfg = Release|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Release|iPhone.Build.0 = Release|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7DCF07B1-B8BD-4EF0-B1FC-2AAC4466B6C6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.AppStore|Any CPU.Build.0 = Release|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.AppStore|iPhone.Build.0 = Debug|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Debug|iPhone.Build.0 = Debug|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Release|Any CPU.Build.0 = Release|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Release|iPhone.ActiveCfg = Release|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Release|iPhone.Build.0 = Release|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Ad-Hoc|Any CPU.ActiveCfg = Release|iPhone
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Ad-Hoc|iPhone.ActiveCfg = Debug|iPhone
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Ad-Hoc|iPhone.Build.0 = Debug|iPhone
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.AppStore|Any CPU.ActiveCfg = Release|iPhone
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.AppStore|iPhone.ActiveCfg = Debug|iPhone
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.AppStore|iPhone.Build.0 = Debug|iPhone
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.AppStore|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.AppStore|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Debug|iPhone.ActiveCfg = Debug|iPhone
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Debug|iPhone.Build.0 = Debug|iPhone
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Release|iPhone.ActiveCfg = Release|iPhone
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Release|iPhone.Build.0 = Release|iPhone
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{8A7939AC-BAC2-4CFB-B429-DB92F106700C}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.AppStore|Any CPU.Build.0 = Release|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.AppStore|iPhone.Build.0 = Debug|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Debug|iPhone.Build.0 = Debug|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Release|Any CPU.Build.0 = Release|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Release|iPhone.ActiveCfg = Release|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Release|iPhone.Build.0 = Release|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{8A7939AC-BAC2-4CFB-B429-DB92F106700C} = {0AB67A65-9645-4DF6-98A2-D5734D212E7C}
{FACB89E5-53A5-4748-9F5B-E0714EBB37B2} = {0AB67A65-9645-4DF6-98A2-D5734D212E7C}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Examples\XamarinIOS\ExampleBrowser\ExampleBrowser.csproj
EndGlobalSection
EndGlobal

4
Source/OxyPlot.Xamarin.Android/OxyPlot.Xamarin.Android.csproj
Просмотреть файл

@ -41,8 +41,8 @@
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="mscorlib" />
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.Core.1.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

2
Source/OxyPlot.Xamarin.Android/OxyPlot.Xamarin.Android.nuspec
Просмотреть файл

@ -13,7 +13,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<tags>xamarin android plotting plot charting chart</tags>
<dependencies>
<dependency id="OxyPlot.Core" version="1.0.0"/>
<dependency id="OxyPlot.Core" version="2.0.0-unstable0956"/>
</dependencies>
</metadata>
<files>

2
Source/OxyPlot.Xamarin.Android/packages.config
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="OxyPlot.Core" version="1.0.0" targetFramework="monoandroid403" />
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="monoandroid60" />
</packages>

4
Source/OxyPlot.Xamarin.Forms.Platform.Android/OxyPlot.Xamarin.Forms.Platform.Android.csproj
Просмотреть файл

@ -44,8 +44,8 @@
</Reference>
<Reference Include="Mono.Android" />
<Reference Include="mscorlib" />
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.Core.1.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

2
Source/OxyPlot.Xamarin.Forms.Platform.Android/packages.config
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="OxyPlot.Core" version="1.0.0" targetFramework="monoandroid60" />
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="MonoAndroid60" />
<package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="MonoAndroid60" />
<package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="MonoAndroid60" />

4
Source/OxyPlot.Xamarin.Forms.Platform.UWP/project.json
Просмотреть файл

@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
"OxyPlot.Core": "1.0.0",
"OxyPlot.Windows": "1.0.0",
"OxyPlot.Core": "2.0.0-unstable0956",
"OxyPlot.Windows": "2.0.0-unstable0956",
"Xamarin.Forms": "2.3.3.180"
},
"frameworks": {

8
Source/OxyPlot.Xamarin.Forms.Platform.WP8/OxyPlot.Xamarin.Forms.Platform.WP8.csproj
Просмотреть файл

@ -99,12 +99,12 @@
<Reference Include="Microsoft.Phone.Controls.Toolkit">
<HintPath>..\packages\WPtoolkit.4.2013.08.16\lib\wp8\Microsoft.Phone.Controls.Toolkit.dll</HintPath>
</Reference>
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.Core.1.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OxyPlot.WP8, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.WP8.1.0.0\lib\windowsphone8\OxyPlot.WP8.dll</HintPath>
<Reference Include="OxyPlot.WP8, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.Windows.2.0.0-unstable0956\lib\windowsphone8\OxyPlot.WP8.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">

5
Source/OxyPlot.Xamarin.Forms.Platform.WP8/packages.config
Просмотреть файл

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="OxyPlot.Core" version="1.0.0" targetFramework="wp8" />
<package id="OxyPlot.WP8" version="1.0.0" targetFramework="wp8" />
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="wp8" />
<package id="OxyPlot.Windows" version="2.0.0-unstable0956" targetFramework="wp8" />
<package id="OxyPlot.WP8" version="2.0.0-unstable0956" targetFramework="wp8" />
<package id="WPtoolkit" version="4.2013.08.16" targetFramework="wp80" />
<package id="Xamarin.Forms" version="2.3.3.180" targetFramework="wp8" />
</packages>

4
Source/OxyPlot.Xamarin.Forms.Platform.iOS/OxyPlot.Xamarin.Forms.Platform.iOS.csproj
Просмотреть файл

@ -35,8 +35,8 @@
<DocumentationFile>..\..\Output\Xamarin.Forms.Platform.iOS\OxyPlot.Xamarin.Forms.Platform.iOS.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.Core.1.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

2
Source/OxyPlot.Xamarin.Forms.Platform.iOS/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="OxyPlot.Core" version="1.0.0" targetFramework="xamarinios10" />
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="2.3.3.180" targetFramework="xamarinios10" />
</packages>

4
Source/OxyPlot.Xamarin.Forms/OxyPlot.Xamarin.Forms.csproj
Просмотреть файл

@ -48,8 +48,8 @@
<Import Project="..\packages\Xamarin.Forms.1.0.6186\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.0.6186\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" />
<Import Project="..\packages\Xamarin.Forms.2.2.0.31\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.2.0.31\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
<ItemGroup>
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.Core.1.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">

6
Source/OxyPlot.Xamarin.Forms/OxyPlot.Xamarin.Forms.nuspec
Просмотреть файл

@ -22,15 +22,15 @@
<dependency id="Xamarin.Forms" version="2.3.3.180" />
</group>
<group targetFramework="uap10.0">
<dependency id="OxyPlot.Windows" version="1.0.0"/>
<dependency id="OxyPlot.Windows" version="2.0.0-unstable0956"/>
<dependency id="Xamarin.Forms" version="2.3.3.180" />
</group>
<group targetFramework="windowsphone8">
<dependency id="OxyPlot.WP8" version="1.0.0"/>
<dependency id="OxyPlot.WP8" version="2.0.0-unstable0956"/>
<dependency id="Xamarin.Forms" version="2.3.3.180" />
</group>
<group>
<dependency id="OxyPlot.Core" version="1.0.0"/>
<dependency id="OxyPlot.Core" version="2.0.0-unstable0956"/>
<dependency id="Xamarin.Forms" version="2.3.3.180" />
</group>
</dependencies>

2
Source/OxyPlot.Xamarin.Forms/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="OxyPlot.Core" version="1.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="Xamarin.Forms" version="2.3.3.180" targetFramework="portable45-net45+win8+wp8+wpa81" />
</packages>

2
Source/OxyPlot.Xamarin.Mac/OxyPlot.Xamarin.Mac.nuspec
Просмотреть файл

@ -12,7 +12,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<tags>xamarin mac unified-api plotting plot charting chart</tags>
<dependencies>
<dependency id="OxyPlot.Core" version="1.0.0"/>
<dependency id="OxyPlot.Core" version="2.0.0-unstable0956"/>
</dependencies>
</metadata>
<files>

67
Source/OxyPlot.Xamarin.iOS/ConverterExtensions.cs
Просмотреть файл

@ -39,30 +39,31 @@ namespace OxyPlot.Xamarin.iOS
public static OxyTouchEventArgs ToTouchEventArgs(this UITouch touch, UIView view)
{
var location = touch.LocationInView(view);
return (location.ToTouchEventArgs());
return location.ToTouchEventArgs();
}
/// <summary>
/// Converts <see cref="CoreGraphics.CGPoint" /> tap location to <see cref="OxyTouchEventArgs" />.
/// </summary>
/// <param name="location">The tap location.</param>
/// <returns>The converted arguments.</returns>
public static OxyTouchEventArgs ToTouchEventArgs(this CGPoint location)
{
return new OxyTouchEventArgs {
Position = new ScreenPoint(location.X, location.Y),
DeltaTranslation = new ScreenVector(0, 0),
DeltaScale = new ScreenVector(1, 1)
};
}
/// <summary>
/// Converts <see cref="CoreGraphics.CGPoint" /> tap location to <see cref="OxyTouchEventArgs" />.
/// </summary>
/// <param name="location">The tap location.</param>
/// <returns>The converted arguments.</returns>
public static OxyTouchEventArgs ToTouchEventArgs(this CGPoint location)
{
return new OxyTouchEventArgs
{
Position = new ScreenPoint(location.X, location.Y),
DeltaTranslation = new ScreenVector(0, 0),
DeltaScale = new ScreenVector(1, 1)
};
}
/// <summary>
/// Converts a <see cref="OxyColor" /> to a <see cref="CGColor" />.
/// </summary>
/// <param name="c">The color to convert.</param>
/// <returns>The converted color.</returns>
// ReSharper disable once InconsistentNaming
public static CGColor ToCGColor(this OxyColor c)
/// <summary>
/// Converts a <see cref="OxyColor" /> to a <see cref="CGColor" />.
/// </summary>
/// <param name="c">The color to convert.</param>
/// <returns>The converted color.</returns>
// ReSharper disable once InconsistentNaming
public static CGColor ToCGColor(this OxyColor c)
{
return new CGColor(c.R / 255f, c.G / 255f, c.B / 255f, c.A / 255f);
}
@ -87,14 +88,14 @@ namespace OxyPlot.Xamarin.iOS
{
switch (lineJoin)
{
case LineJoin.Bevel:
return CGLineJoin.Bevel;
case LineJoin.Miter:
return CGLineJoin.Miter;
case LineJoin.Round:
return CGLineJoin.Round;
default:
throw new InvalidOperationException("Invalid join type.");
case LineJoin.Bevel:
return CGLineJoin.Bevel;
case LineJoin.Miter:
return CGLineJoin.Miter;
case LineJoin.Round:
return CGLineJoin.Round;
default:
throw new InvalidOperationException("Invalid join type.");
}
}
@ -125,10 +126,10 @@ namespace OxyPlot.Xamarin.iOS
/// <returns>The converted rectangle.</returns>
public static CGRect ConvertAliased(this OxyRect rect)
{
float x = 0.5f + (int)rect.Left;
float y = 0.5f + (int)rect.Top;
float ri = 0.5f + (int)rect.Right;
float bo = 0.5f + (int)rect.Bottom;
var x = 0.5f + (int)rect.Left;
var y = 0.5f + (int)rect.Top;
var ri = 0.5f + (int)rect.Right;
var bo = 0.5f + (int)rect.Bottom;
return new CGRect(x, y, ri - x, bo - y);
}

4
Source/OxyPlot.Xamarin.iOS/OxyPlot.Xamarin.iOS.csproj
Просмотреть файл

@ -32,8 +32,8 @@
<DocumentationFile>..\..\Output\Xamarin.iOS\OxyPlot.Xamarin.iOS.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.Core.1.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
<HintPath>..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

2
Source/OxyPlot.Xamarin.iOS/OxyPlot.Xamarin.iOS.nuspec
Просмотреть файл

@ -13,7 +13,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<tags>xamarin iOS plotting plot charting chart</tags>
<dependencies>
<dependency id="OxyPlot.Core" version="1.0.0"/>
<dependency id="OxyPlot.Core" version="2.0.0-unstable0956"/>
</dependencies>
</metadata>
<files>

34
Source/OxyPlot.Xamarin.iOS/PlotView.cs
Просмотреть файл

@ -11,9 +11,6 @@ namespace OxyPlot.Xamarin.iOS
{
using Foundation;
using OxyPlot;
using System;
using System.Collections.Generic;
using System.Linq;
using UIKit;
/// <summary>
@ -32,8 +29,15 @@ namespace OxyPlot.Xamarin.iOS
/// </summary>
private IPlotController defaultController;
private PanZoomGestureRecognizer panZoomGesture = new PanZoomGestureRecognizer();
private UITapGestureRecognizer tapGesture = new UITapGestureRecognizer();
/// <summary>
/// The pan zoom gesture recognizer
/// </summary>
private readonly PanZoomGestureRecognizer panZoomGesture = new PanZoomGestureRecognizer();
/// <summary>
/// The tap gesture recognizer
/// </summary>
private readonly UITapGestureRecognizer tapGesture = new UITapGestureRecognizer();
/// <summary>
/// Initializes a new instance of the <see cref="OxyPlot.Xamarin.iOS.PlotView"/> class.
@ -67,7 +71,7 @@ namespace OxyPlot.Xamarin.iOS
/// </summary>
/// <returns><c>true</c>, if new layout was used, <c>false</c> otherwise.</returns>
[Export ("requiresConstraintBasedLayout")]
bool UseNewLayout ()
private bool UseNewLayout ()
{
return true;
}
@ -81,8 +85,8 @@ namespace OxyPlot.Xamarin.iOS
this.BackgroundColor = UIColor.White;
this.KeepAspectRatioWhenPinching = true;
this.panZoomGesture.AddTarget(HandlePanZoomGesture);
this.tapGesture.AddTarget(HandleTapGesture);
this.panZoomGesture.AddTarget(this.HandlePanZoomGesture);
this.tapGesture.AddTarget(this.HandleTapGesture);
//Prevent panZoom and tap gestures from being recognized simultaneously
this.tapGesture.RequireGestureRecognizerToFail(this.panZoomGesture);
@ -351,26 +355,26 @@ namespace OxyPlot.Xamarin.iOS
private void HandlePanZoomGesture()
{
switch (panZoomGesture.State)
switch (this.panZoomGesture.State)
{
case UIGestureRecognizerState.Began:
ActualController.HandleTouchStarted(this, panZoomGesture.TouchEventArgs);
this.ActualController.HandleTouchStarted(this, this.panZoomGesture.TouchEventArgs);
break;
case UIGestureRecognizerState.Changed:
ActualController.HandleTouchDelta(this, panZoomGesture.TouchEventArgs);
this.ActualController.HandleTouchDelta(this, this.panZoomGesture.TouchEventArgs);
break;
case UIGestureRecognizerState.Ended:
case UIGestureRecognizerState.Cancelled:
ActualController.HandleTouchCompleted(this, panZoomGesture.TouchEventArgs);
this.ActualController.HandleTouchCompleted(this, this.panZoomGesture.TouchEventArgs);
break;
}
}
private void HandleTapGesture()
{
var location = tapGesture.LocationInView(this);
ActualController.HandleTouchStarted(this, location.ToTouchEventArgs());
ActualController.HandleTouchCompleted(this, location.ToTouchEventArgs());
var location = this.tapGesture.LocationInView(this);
this.ActualController.HandleTouchStarted(this, location.ToTouchEventArgs());
this.ActualController.HandleTouchCompleted(this, location.ToTouchEventArgs());
}
}
}

2
Source/OxyPlot.Xamarin.iOS/packages.config
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="OxyPlot.Core" version="1.0.0" targetFramework="xamarinios10" />
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="xamarinios10" />
</packages>