From 6b3d80bba6d68afe21ce2bc23f3d49b070e9802f Mon Sep 17 00:00:00 2001 From: kamu Date: Tue, 3 Apr 2018 15:51:57 +0900 Subject: [PATCH] bug fix --- Sample/Sample.Droid/Sample.Droid.csproj | 36 ++++++++++---------- Sample/Sample.Droid/packages.config | 6 ++-- Sample/Sample.iOS/Sample.iOS.csproj | 30 ++++++++-------- Sample/Sample.iOS/packages.config | 6 ++-- Sample/Sample/Sample.nuget.props | 4 +-- Sample/Sample/Sample.nuget.targets | 2 +- Sample/Sample/project.json | 6 ++-- SettingsView.iOS/Cells/NumberPickerSource.cs | 6 ++-- SettingsView/SettingsView.nuget.props | 2 +- nuget/SettingsView_mac.nuspec | 6 ++-- 10 files changed, 51 insertions(+), 53 deletions(-) diff --git a/Sample/Sample.Droid/Sample.Droid.csproj b/Sample/Sample.Droid/Sample.Droid.csproj index 765ee62..9a8df3f 100644 --- a/Sample/Sample.Droid/Sample.Droid.csproj +++ b/Sample/Sample.Droid/Sample.Droid.csproj @@ -1,6 +1,6 @@ - + Debug AnyCPU @@ -89,12 +89,6 @@ ..\packages\Xamarin.Forms.Svg.0.0.1-pre\lib\MonoAndroid\SvgImageSource.Droid.dll - - ..\packages\AiForms.Effects.1.1.0-pre1\lib\MonoAndroid\AiForms.Effects.dll - - - ..\packages\AiForms.Effects.1.1.0-pre1\lib\MonoAndroid\AiForms.Effects.Droid.dll - ..\packages\Xamarin.Android.Support.Annotations.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Annotations.dll @@ -143,26 +137,32 @@ ..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll + + ..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll + - ..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\FormsViewGroup.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\FormsViewGroup.dll - ..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Core.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + + + ..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Platform.dll - ..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll - - ..\packages\AiForms.Layouts.1.0.3\lib\netstandard1.1\AiForms.Layouts.dll + + ..\packages\AiForms.Effects.1.2.0\lib\MonoAndroid\AiForms.Effects.dll - - ..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll + + ..\packages\AiForms.Effects.1.2.0\lib\MonoAndroid\AiForms.Effects.Droid.dll - - ..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + + ..\packages\AiForms.Layouts.1.0.4\lib\netstandard1.1\AiForms.Layouts.dll @@ -222,5 +222,5 @@ - + \ No newline at end of file diff --git a/Sample/Sample.Droid/packages.config b/Sample/Sample.Droid/packages.config index 447c091..ffe8289 100644 --- a/Sample/Sample.Droid/packages.config +++ b/Sample/Sample.Droid/packages.config @@ -1,7 +1,7 @@  - - + + @@ -44,6 +44,6 @@ - + \ No newline at end of file diff --git a/Sample/Sample.iOS/Sample.iOS.csproj b/Sample/Sample.iOS/Sample.iOS.csproj index 342402f..ee06042 100644 --- a/Sample/Sample.iOS/Sample.iOS.csproj +++ b/Sample/Sample.iOS/Sample.iOS.csproj @@ -1,6 +1,6 @@ - + Debug iPhoneSimulator @@ -125,29 +125,29 @@ ..\packages\Xamarin.Forms.Svg.0.0.1-pre\lib\Xamarin.iOS10\SvgImageSource.iOS.dll - - ..\packages\AiForms.Effects.1.1.0-pre1\lib\Xamarin.iOS10\AiForms.Effects.dll - - - ..\packages\AiForms.Effects.1.1.0-pre1\lib\Xamarin.iOS10\AiForms.Effects.iOS.dll + + ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - ..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - ..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - ..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - - ..\packages\AiForms.Layouts.1.0.3\lib\netstandard1.1\AiForms.Layouts.dll + + ..\packages\AiForms.Effects.1.2.0\lib\Xamarin.iOS10\AiForms.Effects.dll - - ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll + + ..\packages\AiForms.Effects.1.2.0\lib\Xamarin.iOS10\AiForms.Effects.iOS.dll + + + ..\packages\AiForms.Layouts.1.0.4\lib\netstandard1.1\AiForms.Layouts.dll @@ -184,5 +184,5 @@ - + \ No newline at end of file diff --git a/Sample/Sample.iOS/packages.config b/Sample/Sample.iOS/packages.config index 99a56cc..95add4f 100644 --- a/Sample/Sample.iOS/packages.config +++ b/Sample/Sample.iOS/packages.config @@ -1,7 +1,7 @@  - - + + @@ -34,6 +34,6 @@ - + \ No newline at end of file diff --git a/Sample/Sample/Sample.nuget.props b/Sample/Sample/Sample.nuget.props index 82aeaa9..8fbc07f 100644 --- a/Sample/Sample/Sample.nuget.props +++ b/Sample/Sample/Sample.nuget.props @@ -3,7 +3,7 @@ True NuGet - /Users/kamu/Dropbox/work/projects/AiForms.Renderers/Sample/Sample/project.lock.json + /Volumes/SD/Dropbox/work/projects/AiForms.Renderers/Sample/Sample/project.lock.json /Users/kamu/.nuget/packages/ /Users/kamu/.nuget/packages/ ProjectJson @@ -13,6 +13,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/Sample/Sample/Sample.nuget.targets b/Sample/Sample/Sample.nuget.targets index f685a79..70edce6 100644 --- a/Sample/Sample/Sample.nuget.targets +++ b/Sample/Sample/Sample.nuget.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/Sample/Sample/project.json b/Sample/Sample/project.json index b82313c..cd33d32 100644 --- a/Sample/Sample/project.json +++ b/Sample/Sample/project.json @@ -1,7 +1,7 @@ { "dependencies": { - "AiForms.Effects": "1.1.0-pre1", - "AiForms.Layouts": "1.0.0", + "AiForms.Effects": "1.2.0", + "AiForms.Layouts": "1.0.4", "CommonServiceLocator": "1.3", "Microsoft.NETCore.Portable.Compatibility": "1.0.1", "NETStandard.Library": "1.6.0", @@ -16,7 +16,7 @@ "System.Reactive.Linq": "3.0.0", "System.Reactive.PlatformServices": "3.0.0", "Unity": "4.0.1", - "Xamarin.Forms": "2.5.0.121934", + "Xamarin.Forms": "2.5.0.280555", "Xamarin.Forms.Svg": "0.0.1-pre" }, "frameworks": { diff --git a/SettingsView.iOS/Cells/NumberPickerSource.cs b/SettingsView.iOS/Cells/NumberPickerSource.cs index b803f1c..b18f018 100644 --- a/SettingsView.iOS/Cells/NumberPickerSource.cs +++ b/SettingsView.iOS/Cells/NumberPickerSource.cs @@ -82,10 +82,8 @@ public void SetNumbers(int min, int max) if (min < 0) min = 0; if (max < 0) max = 0; if (min > max) { - throw new ArgumentOutOfRangeException( - nameof(NumberPickerCell.Max), - "Max value must be greater than or equal to Min value." - ); + //Set min value to zero temporally, because it is sometimes min greater than max depending on the order which min and max value is bound. + min = 0; } Items = Enumerable.Range(min, max - min + 1).ToList(); } diff --git a/SettingsView/SettingsView.nuget.props b/SettingsView/SettingsView.nuget.props index 1f90d0a..342d082 100644 --- a/SettingsView/SettingsView.nuget.props +++ b/SettingsView/SettingsView.nuget.props @@ -3,7 +3,7 @@ True NuGet - /Users/kamu/Dropbox/work/projects/AiForms.Renderers/SettingsView/project.lock.json + /Volumes/SD/Dropbox/work/projects/AiForms.Renderers/SettingsView/project.lock.json /Users/kamu/.nuget/packages/ /Users/kamu/.nuget/packages/ ProjectJson diff --git a/nuget/SettingsView_mac.nuspec b/nuget/SettingsView_mac.nuspec index 9387358..89e468a 100644 --- a/nuget/SettingsView_mac.nuspec +++ b/nuget/SettingsView_mac.nuspec @@ -2,7 +2,7 @@ AiForms.SettingsView - 0.2.2 + 0.2.3 SettingsView for Xamarin.Forms kamu kamu @@ -14,9 +14,9 @@ There are various cells such as (LabelCell,ButtonCell,CommandCell,SwitchCell,Che -## New features +## Bug fixes -* TextPickerCell - This is used to pick one of value type List as Text. (pull request #26) +* [NumberPickerCell][iOS] sometimes crash depending on the order which min and max value is bound. Xamarin.Forms TableView Cell Setting Configuration Option ListView UITableView RecyclerView ReOrder DragDrop en-US