diff --git a/Sample/Sample.Droid/Sample.Droid.csproj b/Sample/Sample.Droid/Sample.Droid.csproj
index 9a8df3f..dca5b3c 100644
--- a/Sample/Sample.Droid/Sample.Droid.csproj
+++ b/Sample/Sample.Droid/Sample.Droid.csproj
@@ -1,6 +1,6 @@
-
+
Debug
AnyCPU
@@ -140,29 +140,29 @@
..\packages\System.Reactive.Interfaces.3.0.0\lib\netstandard1.0\System.Reactive.Interfaces.dll
+
+ ..\packages\AiForms.Effects.1.2.0\lib\MonoAndroid\AiForms.Effects.dll
+
+
+ ..\packages\AiForms.Effects.1.2.0\lib\MonoAndroid\AiForms.Effects.Droid.dll
+
+
+ ..\packages\AiForms.Layouts.1.0.4\lib\netstandard1.1\AiForms.Layouts.dll
+
- ..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\FormsViewGroup.dll
+ ..\packages\Xamarin.Forms.2.5.1.444934\lib\MonoAndroid10\FormsViewGroup.dll
- ..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Core.dll
+ ..\packages\Xamarin.Forms.2.5.1.444934\lib\MonoAndroid10\Xamarin.Forms.Core.dll
- ..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll
+ ..\packages\Xamarin.Forms.2.5.1.444934\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.1.444934\lib\MonoAndroid10\Xamarin.Forms.Platform.dll
- ..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll
-
-
- ..\packages\AiForms.Effects.1.2.0\lib\MonoAndroid\AiForms.Effects.dll
-
-
- ..\packages\AiForms.Effects.1.2.0\lib\MonoAndroid\AiForms.Effects.Droid.dll
-
-
- ..\packages\AiForms.Layouts.1.0.4\lib\netstandard1.1\AiForms.Layouts.dll
+ ..\packages\Xamarin.Forms.2.5.1.444934\lib\MonoAndroid10\Xamarin.Forms.Xaml.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 ffe8289..6081808 100644
--- a/Sample/Sample.Droid/packages.config
+++ b/Sample/Sample.Droid/packages.config
@@ -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 ee06042..0d3b888 100644
--- a/Sample/Sample.iOS/Sample.iOS.csproj
+++ b/Sample/Sample.iOS/Sample.iOS.csproj
@@ -1,6 +1,6 @@
-
+
Debug
iPhoneSimulator
@@ -128,18 +128,6 @@
..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll
-
- ..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll
-
-
- ..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll
-
-
- ..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll
-
-
- ..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll
-
..\packages\AiForms.Effects.1.2.0\lib\Xamarin.iOS10\AiForms.Effects.dll
@@ -149,6 +137,18 @@
..\packages\AiForms.Layouts.1.0.4\lib\netstandard1.1\AiForms.Layouts.dll
+
+ ..\packages\Xamarin.Forms.2.5.1.444934\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll
+
+
+ ..\packages\Xamarin.Forms.2.5.1.444934\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll
+
+
+ ..\packages\Xamarin.Forms.2.5.1.444934\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll
+
+
+ ..\packages\Xamarin.Forms.2.5.1.444934\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.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 95add4f..b9a1b16 100644
--- a/Sample/Sample.iOS/packages.config
+++ b/Sample/Sample.iOS/packages.config
@@ -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 8fbc07f..89378d1 100644
--- a/Sample/Sample/Sample.nuget.props
+++ b/Sample/Sample/Sample.nuget.props
@@ -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 70edce6..7c49916 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/ViewModels/EntryCellTestViewModel.cs b/Sample/Sample/ViewModels/EntryCellTestViewModel.cs
index 8dee96d..fcc6e25 100644
--- a/Sample/Sample/ViewModels/EntryCellTestViewModel.cs
+++ b/Sample/Sample/ViewModels/EntryCellTestViewModel.cs
@@ -1,10 +1,11 @@
using System;
using Reactive.Bindings;
using Xamarin.Forms;
+using Prism.Navigation;
namespace Sample.ViewModels
{
- public class EntryCellTestViewModel:ViewModelBase
+ public class EntryCellTestViewModel:ViewModelBase,IDestructible
{
public ReactiveProperty OwnAccentColor { get; } = new ReactiveProperty();
public ReactiveProperty MaxLength { get; } = new ReactiveProperty();
@@ -58,5 +59,10 @@ protected override void CellChanged(object obj)
break;
}
}
+
+ public void Destroy()
+ {
+ InputText.Dispose();
+ }
}
}
diff --git a/Sample/Sample/project.json b/Sample/Sample/project.json
index cd33d32..3aa5322 100644
--- a/Sample/Sample/project.json
+++ b/Sample/Sample/project.json
@@ -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.280555",
+ "Xamarin.Forms": "2.5.1.444934",
"Xamarin.Forms.Svg": "0.0.1-pre"
},
"frameworks": {
diff --git a/SettingsView/Cells/EntryCell.cs b/SettingsView/Cells/EntryCell.cs
index 3a35fc3..e647fd2 100644
--- a/SettingsView/Cells/EntryCell.cs
+++ b/SettingsView/Cells/EntryCell.cs
@@ -27,9 +27,9 @@ static void ValueTextPropertyChanging(BindableObject bindable, object oldValue,
var maxlength = (int)bindable.GetValue(MaxLengthProperty);
if (maxlength < 0) return;
- var newString = newValue.ToString();
+ var newString = newValue?.ToString() ?? string.Empty;
if (newString.Length > maxlength) {
- var oldString = oldValue.ToString();
+ var oldString = oldValue?.ToString() ?? string.Empty;
if(oldString.Length > maxlength){
var trimStr = oldString.Substring(0, maxlength);
bindable.SetValue(ValueTextProperty, trimStr);
diff --git a/nuget/SettingsView_mac.nuspec b/nuget/SettingsView_mac.nuspec
index 89e468a..d71e96e 100644
--- a/nuget/SettingsView_mac.nuspec
+++ b/nuget/SettingsView_mac.nuspec
@@ -2,7 +2,7 @@
AiForms.SettingsView
- 0.2.3
+ 0.2.4
SettingsView for Xamarin.Forms
kamu
kamu
@@ -16,7 +16,7 @@ There are various cells such as (LabelCell,ButtonCell,CommandCell,SwitchCell,Che
## Bug fixes
-* [NumberPickerCell][iOS] sometimes crash depending on the order which min and max value is bound.
+* [EntryCell] Null exception in ValueTextChanging.
Xamarin.Forms TableView Cell Setting Configuration Option ListView UITableView RecyclerView ReOrder DragDrop
en-US