Fixed #21 TagEntry crash

daniel-luberda · Oct 6, 2016 · 8ed4ed3 · 8ed4ed3
1 parent 1d3c566
commit 8ed4ed3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/...ryView/DLToolkit.Forms.Controls.TagEntryView/DLToolkit.Forms.Controls.TagEntryView.csproj b/...ryView/DLToolkit.Forms.Controls.TagEntryView/DLToolkit.Forms.Controls.TagEntryView.csproj
@@ -40,16 +40,17 @@
   <Import Project="..\..\packages\Xamarin.Forms.2.1.0.6524\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.1.0.6524\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <ItemGroup>
     <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\..\packages\Xamarin.Forms.2.1.0.6524\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\..\packages\Xamarin.Forms.2.1.0.6524\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\..\packages\Xamarin.Forms.2.1.0.6524\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Forms.Xaml">
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
 </Project>
diff --git a/TagEntryView/DLToolkit.Forms.Controls.TagEntryView/TagEntryView.cs b/TagEntryView/DLToolkit.Forms.Controls.TagEntryView/TagEntryView.cs
@@ -70,15 +70,15 @@ internal void PerformTagTap(object item)
 
 		public Func<View> TagViewFactory { get; set; }
 
-        public static BindableProperty TagTappedCommandProperty = BindableProperty.Create("TagTappedCommand", typeof(ICommand), typeof(TagEntryView), null);
+		public static BindableProperty TagTappedCommandProperty = BindableProperty.Create(nameof(TagTappedCommand), typeof(ICommand), typeof(TagEntryView), default(ICommand));
 
 		public ICommand TagTappedCommand
 		{
 			get { return (ICommand)GetValue(TagTappedCommandProperty); }
 			set { SetValue(TagTappedCommandProperty, value); }
 		}
 
-		public static readonly BindableProperty TagSeparatorsProperty = BindableProperty.Create("TagSeparators", typeof(IList<string>), typeof(TagEntryView), new List<string>() { " " });
+		public static readonly BindableProperty TagSeparatorsProperty = BindableProperty.Create(nameof(TagSeparators), typeof(IList<string>), typeof(TagEntryView), new List<string>() { " " });
 
 		public IList<string> TagSeparators
 		{
@@ -87,7 +87,7 @@ public IList<string> TagSeparators
 		}
 
 
-        public static readonly BindableProperty EntryMinimumWidthProperty = BindableProperty.Create("EntryMinimumWidth", typeof(double), typeof(TagEntryView), 150f);
+		public static readonly BindableProperty EntryMinimumWidthProperty = BindableProperty.Create(nameof(EntryMinimumWidth), typeof(double), typeof(TagEntryView), 150d);
 
 		public double EntryMinimumWidth
 		{
@@ -96,7 +96,7 @@ public double EntryMinimumWidth
 		}
 
 
-		public static readonly BindableProperty TagItemsProperty = BindableProperty.Create("TagItems", typeof(IList), typeof(TagEntryView), default(IList), BindingMode.TwoWay);
+		public static readonly BindableProperty TagItemsProperty = BindableProperty.Create(nameof(TagItems), typeof(IList), typeof(TagEntryView), default(IList), BindingMode.TwoWay);
 
 		public IList TagItems
 		{
@@ -105,7 +105,7 @@ public IList TagItems
 		}
 
 
-        public static readonly BindableProperty SpacingProperty = BindableProperty.Create("Spacing", typeof(double), typeof(TagEntryView), 6, 
+		public static readonly BindableProperty SpacingProperty = BindableProperty.Create(nameof(Spacing), typeof(double), typeof(TagEntryView), 6d, 
 				propertyChanged: (bindable, oldvalue, newvalue) => ((TagEntryView)bindable).OnSizeChanged());
 
 		public double Spacing 

diff --git a/TagEntryView/DLToolkit.Forms.Controls.TagEntryView/packages.config b/TagEntryView/DLToolkit.Forms.Controls.TagEntryView/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Xamarin.Forms" version="2.1.0.6524" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarintvos10+xamarinwatchos10+xamarinios10" />
+  <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="portable45-net45+win8+wp8" />
 </packages>