Skip to content

Commit

Permalink
.NETStandard2.0 / fix SettingsViewRecyclerAdapter
Browse files Browse the repository at this point in the history
  • Loading branch information
kamu authored and kamu committed May 21, 2018
1 parent 5381782 commit 0350770
Show file tree
Hide file tree
Showing 23 changed files with 302 additions and 651 deletions.
20 changes: 9 additions & 11 deletions Sample/Sample.Droid/MainActivity.cs
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
using Android.App;
using Android.Content.PM;
using Android.OS;
using Microsoft.Practices.Unity;
using Prism.Unity;
using AiForms.Renderers;
using Prism;
using Prism.Ioc;

namespace Sample.Droid
{
[Activity(Label = "Sample.Droid", Icon = "@drawable/icon",Theme = "@style/MyTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
[Activity(Label = "Sample.Droid", Icon = "@drawable/icon",Theme = "@style/MyTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
{
protected override void OnCreate(Bundle bundle)
Expand All @@ -27,11 +26,10 @@ protected override void OnCreate(Bundle bundle)
}
}

public class AndroidInitializer : IPlatformInitializer
{
public void RegisterTypes(IUnityContainer container)
{

}
}
public class AndroidInitializer : IPlatformInitializer
{
public void RegisterTypes(IContainerRegistry containerRegistry)
{
}
}
}
91 changes: 51 additions & 40 deletions Sample/Sample.Droid/Sample.Droid.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Xamarin.Forms.2.5.1.444934\build\netstandard1.0\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.2.5.1.444934\build\netstandard1.0\Xamarin.Forms.props')" />
<Import Project="..\packages\Xamarin.Forms.3.0.0.482510\build\netstandard2.0\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.3.0.0.482510\build\netstandard2.0\Xamarin.Forms.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand Down Expand Up @@ -48,33 +48,6 @@
<Reference Include="Microsoft.Practices.ServiceLocation">
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.Unity">
<HintPath>..\packages\Unity.4.0.1\lib\portable-net45+wp80+win8+wpa81+MonoAndroid10+MonoTouch10\Microsoft.Practices.Unity.dll</HintPath>
</Reference>
<Reference Include="Prism">
<HintPath>..\packages\Prism.Core.6.3.0\lib\MonoAndroid10\Prism.dll</HintPath>
</Reference>
<Reference Include="Prism.Forms">
<HintPath>..\packages\Prism.Forms.6.3.0\lib\MonoAndroid1.0\Prism.Forms.dll</HintPath>
</Reference>
<Reference Include="Prism.Unity.Forms">
<HintPath>..\packages\Prism.Unity.Forms.6.3.0\lib\MonoAndroid1.0\Prism.Unity.Forms.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\System.Reactive.Core.3.0.0\lib\netstandard1.3\System.Reactive.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Linq">
<HintPath>..\packages\System.Reactive.Linq.3.0.0\lib\netstandard1.3\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.PlatformServices">
<HintPath>..\packages\System.Reactive.PlatformServices.3.0.0\lib\netstandard1.3\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="ReactiveProperty.Android">
<HintPath>..\packages\ReactiveProperty.3.2.0\lib\MonoAndroid\ReactiveProperty.Android.dll</HintPath>
</Reference>
<Reference Include="ReactiveProperty">
<HintPath>..\packages\ReactiveProperty.3.2.0\lib\MonoAndroid\ReactiveProperty.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="NGraphics.Android">
Expand Down Expand Up @@ -137,32 +110,70 @@
<Reference Include="Xamarin.Android.Support.v7.MediaRouter">
<HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Interfaces">
<HintPath>..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll</HintPath>
<Reference Include="AiForms.Layouts">
<HintPath>..\packages\AiForms.Layouts.1.0.4\lib\netstandard1.1\AiForms.Layouts.dll</HintPath>
</Reference>
<Reference Include="AiForms.Effects">
<HintPath>..\packages\AiForms.Effects.1.2.0\lib\MonoAndroid\AiForms.Effects.dll</HintPath>
<HintPath>..\packages\AiForms.Effects.1.3.1\lib\MonoAndroid\AiForms.Effects.dll</HintPath>
</Reference>
<Reference Include="AiForms.Effects.Droid">
<HintPath>..\packages\AiForms.Effects.1.2.0\lib\MonoAndroid\AiForms.Effects.Droid.dll</HintPath>
<HintPath>..\packages\AiForms.Effects.1.3.1\lib\MonoAndroid\AiForms.Effects.Droid.dll</HintPath>
</Reference>
<Reference Include="AiForms.Layouts">
<HintPath>..\packages\AiForms.Layouts.1.0.4\lib\netstandard1.1\AiForms.Layouts.dll</HintPath>
<Reference Include="Prism">
<HintPath>..\packages\Prism.Core.7.0.0.396\lib\netstandard2.0\Prism.dll</HintPath>
</Reference>
<Reference Include="CommonServiceLocator">
<HintPath>..\packages\Unity.5.5.5\lib\netstandard2.0\CommonServiceLocator.dll</HintPath>
</Reference>
<Reference Include="Unity.Abstractions">
<HintPath>..\packages\Unity.5.5.5\lib\netstandard2.0\Unity.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Unity.Container">
<HintPath>..\packages\Unity.5.5.5\lib\netstandard2.0\Unity.Container.dll</HintPath>
</Reference>
<Reference Include="Unity.ServiceLocation">
<HintPath>..\packages\Unity.5.5.5\lib\netstandard2.0\Unity.ServiceLocation.dll</HintPath>
</Reference>
<Reference Include="Prism.Forms">
<HintPath>..\packages\Prism.Forms.7.0.0.396\lib\netstandard2.0\Prism.Forms.dll</HintPath>
</Reference>
<Reference Include="Prism.Unity.Forms">
<HintPath>..\packages\Prism.Unity.Forms.7.0.0.396\lib\netstandard2.0\Prism.Unity.Forms.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Reactive.Interfaces">
<HintPath>..\packages\System.Reactive.Interfaces.3.1.1\lib\netstandard1.0\System.Reactive.Interfaces.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\System.Reactive.Core.3.1.1\lib\netstandard1.3\System.Reactive.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Linq">
<HintPath>..\packages\System.Reactive.Linq.3.1.1\lib\netstandard1.3\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.PlatformServices">
<HintPath>..\packages\System.Reactive.PlatformServices.3.1.1\lib\netstandard1.3\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="ReactiveProperty.Android">
<HintPath>..\packages\ReactiveProperty.4.2.2\lib\MonoAndroid\ReactiveProperty.Android.dll</HintPath>
</Reference>
<Reference Include="ReactiveProperty">
<HintPath>..\packages\ReactiveProperty.4.2.2\lib\MonoAndroid\ReactiveProperty.dll</HintPath>
</Reference>
<Reference Include="FormsViewGroup">
<HintPath>..\packages\Xamarin.Forms.2.5.1.444934\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.3.0.0.482510\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.2.5.1.444934\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.3.0.0.482510\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.Android">
<HintPath>..\packages\Xamarin.Forms.2.5.1.444934\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.3.0.0.482510\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\packages\Xamarin.Forms.2.5.1.444934\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.3.0.0.482510\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.2.5.1.444934\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.3.0.0.482510\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -222,5 +233,5 @@
<Import Project="..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.AppCompat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.Design.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Design.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Design.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Design.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.targets')" />
<Import Project="..\packages\Xamarin.Forms.2.5.1.444934\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.5.1.444934\build\netstandard1.0\Xamarin.Forms.targets')" />
<Import Project="..\packages\Xamarin.Forms.3.0.0.482510\build\netstandard2.0\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.3.0.0.482510\build\netstandard2.0\Xamarin.Forms.targets')" />
</Project>
59 changes: 47 additions & 12 deletions Sample/Sample.Droid/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AiForms.Effects" version="1.2.0" targetFramework="monoandroid81" />
<package id="AiForms.Effects" version="1.3.1" targetFramework="monoandroid81" />
<package id="AiForms.Layouts" version="1.0.4" targetFramework="monoandroid81" />
<package id="CommonServiceLocator" version="1.3" targetFramework="monoandroid71" />
<package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="monoandroid81" />
<package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="monoandroid81" />
<package id="NETStandard.Library" version="1.6.0" targetFramework="monoandroid81" />
<package id="NGraphics" version="0.4.0" targetFramework="monoandroid71" />
<package id="Prism.Core" version="6.3.0" targetFramework="monoandroid71" />
<package id="Prism.Forms" version="6.3.0" targetFramework="monoandroid71" />
<package id="Prism.Unity.Forms" version="6.3.0" targetFramework="monoandroid71" />
<package id="ReactiveProperty" version="3.2.0" targetFramework="monoandroid71" />
<package id="Prism.Core" version="7.0.0.396" targetFramework="monoandroid81" />
<package id="Prism.Forms" version="7.0.0.396" targetFramework="monoandroid81" />
<package id="Prism.Unity.Forms" version="7.0.0.396" targetFramework="monoandroid81" />
<package id="ReactiveProperty" version="4.2.2" targetFramework="monoandroid81" />
<package id="System.AppContext" version="4.1.0" targetFramework="monoandroid81" />
<package id="System.Collections" version="4.0.11" targetFramework="monoandroid71" />
<package id="System.Collections.Concurrent" version="4.0.12" targetFramework="monoandroid71" />
<package id="System.ComponentModel" version="4.0.1" targetFramework="monoandroid71" />
<package id="System.Console" version="4.0.0" targetFramework="monoandroid81" />
<package id="System.Diagnostics.Contracts" version="4.0.1" targetFramework="monoandroid81" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="monoandroid71" />
<package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="monoandroid71" />
<package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="monoandroid81" />
<package id="System.Dynamic.Runtime" version="4.0.11" targetFramework="monoandroid81" />
<package id="System.Globalization" version="4.0.11" targetFramework="monoandroid71" />
<package id="System.Globalization.Calendars" version="4.0.1" targetFramework="monoandroid81" />
<package id="System.IO" version="4.1.0" targetFramework="monoandroid81" />
<package id="System.IO.Compression" version="4.1.0" targetFramework="monoandroid81" />
<package id="System.IO.Compression.ZipFile" version="4.0.1" targetFramework="monoandroid81" />
<package id="System.IO.FileSystem" version="4.0.1" targetFramework="monoandroid81" />
<package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="monoandroid81" />
<package id="System.Linq" version="4.1.0" targetFramework="monoandroid71" />
<package id="System.Reactive" version="3.0.0" targetFramework="monoandroid71" />
<package id="System.Reactive.Core" version="3.0.0" targetFramework="monoandroid71" />
<package id="System.Reactive.Interfaces" version="3.0.0" targetFramework="monoandroid71" />
<package id="System.Reactive.Linq" version="3.0.0" targetFramework="monoandroid71" />
<package id="System.Reactive.PlatformServices" version="3.0.0" targetFramework="monoandroid71" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="monoandroid81" />
<package id="System.Net.Http" version="4.1.0" targetFramework="monoandroid81" />
<package id="System.Net.Primitives" version="4.0.11" targetFramework="monoandroid81" />
<package id="System.Net.Sockets" version="4.1.0" targetFramework="monoandroid81" />
<package id="System.ObjectModel" version="4.0.12" targetFramework="monoandroid81" />
<package id="System.Reactive" version="3.1.1" targetFramework="monoandroid81" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="monoandroid81" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="monoandroid81" />
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="monoandroid81" />
<package id="System.Reactive.PlatformServices" version="3.1.1" targetFramework="monoandroid81" />
<package id="System.Reflection" version="4.1.0" targetFramework="monoandroid71" />
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="monoandroid81" />
<package id="System.Reflection.Primitives" version="4.0.1" targetFramework="monoandroid81" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="monoandroid71" />
<package id="System.Runtime" version="4.1.0" targetFramework="monoandroid71" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="monoandroid71" />
<package id="System.Runtime.Handles" version="4.0.1" targetFramework="monoandroid81" />
<package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="monoandroid81" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="monoandroid81" />
<package id="System.Runtime.InteropServices.WindowsRuntime" version="4.0.1" targetFramework="monoandroid71" />
<package id="System.Runtime.Numerics" version="4.0.1" targetFramework="monoandroid81" />
<package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="monoandroid81" />
<package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="monoandroid81" />
<package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="monoandroid81" />
<package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="monoandroid81" />
<package id="System.Text.Encoding" version="4.0.11" targetFramework="monoandroid81" />
<package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="monoandroid81" />
<package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="monoandroid81" />
<package id="System.Threading" version="4.0.11" targetFramework="monoandroid71" />
<package id="System.Threading.Tasks" version="4.0.11" targetFramework="monoandroid71" />
<package id="Unity" version="4.0.1" targetFramework="monoandroid71" />
<package id="System.Threading.Timer" version="4.0.1" targetFramework="monoandroid81" />
<package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="monoandroid81" />
<package id="System.Xml.XDocument" version="4.0.11" targetFramework="monoandroid81" />
<package id="Unity" version="5.5.5" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Annotations" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Compat" version="25.4.0.2" targetFramework="monoandroid80" />
Expand All @@ -44,6 +79,6 @@
<package id="Xamarin.Android.Support.v7.Palette" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Forms" version="2.5.1.444934" targetFramework="monoandroid81" />
<package id="Xamarin.Forms" version="3.0.0.482510" targetFramework="monoandroid81" />
<package id="Xamarin.Forms.Svg" version="0.0.1-pre" targetFramework="monoandroid71" />
</packages>
25 changes: 12 additions & 13 deletions Sample/Sample.iOS/AppDelegate.cs
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
using Foundation;
using Microsoft.Practices.Unity;
using Prism.Unity;
using Prism;
using Prism.Ioc;
using UIKit;

namespace Sample.iOS
{
// 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")]
// 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 : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
{
//
Expand All @@ -32,11 +32,10 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
}
}

public class iOSInitializer : IPlatformInitializer
{
public void RegisterTypes(IUnityContainer container)
{

}
}
public class iOSInitializer : IPlatformInitializer
{
public void RegisterTypes(IContainerRegistry containerRegistry)
{
}
}
}
Loading

0 comments on commit 0350770

Please sign in to comment.