Merge pull request #36 from muak/fixProp

Release 0.2.6
muak · Aug 6, 2018 · d0c3d2b · d0c3d2b
2 parents 0350770 + 91306ca
commit d0c3d2b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/Sample/Sample/ViewModels/CollectionChangedTestViewModel.cs b/Sample/Sample/ViewModels/CollectionChangedTestViewModel.cs
@@ -1,5 +1,6 @@
 using System;
 using Reactive.Bindings;
+using System.Diagnostics;
 namespace Sample.ViewModels
 {
     public class CollectionChangedTestViewModel:ViewModelBase
@@ -32,6 +33,10 @@ public CollectionChangedTestViewModel()
                     }
                 }
             });
+
+            CellIconSize.Subscribe(x => {
+                Debug.WriteLine($"CellIconSizeChange {x.Width} {x.Height}");
+            });
         }
     }
 }
diff --git a/Sample/Sample/Views/MainPage.xaml b/Sample/Sample/Views/MainPage.xaml
@@ -19,6 +19,7 @@
         <Button Text="ButtonCellTest" Command="{Binding GoToTest}"  CommandParameter="ButtonCellTest" />
         <Button Text="FormsCellTest" Command="{Binding GoToTest}"  CommandParameter="FormsCellTest" />
         <Button Text="OnTableViewTest" Command="{Binding GoToTest}"  CommandParameter="OnTableViewTest" />
+        <Button Text="Fix" Command="{Binding GoToTest}"  CommandParameter="FixProp" />
 	</StackLayout>
      </ScrollView>
 </ContentPage>
diff --git a/SettingsView.Droid/Cells/CellBaseView.cs b/SettingsView.Droid/Cells/CellBaseView.cs
@@ -193,6 +193,11 @@ public virtual void CellPropertyChanged(object sender, PropertyChangedEventArgs
         /// <param name="e">E.</param>
         public virtual void ParentPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
+            // avoid running the vain process when popping a page.
+            if((sender as BindableObject)?.BindingContext == null){
+                return;
+            }
+
             if (e.PropertyName == SettingsView.CellTitleColorProperty.PropertyName) {
                 UpdateTitleColor();
             }

diff --git a/SettingsView.Droid/SettingsViewRecyclerAdapter.cs b/SettingsView.Droid/SettingsViewRecyclerAdapter.cs
@@ -474,7 +474,18 @@ void FillCache()
 
             _cellCaches = newCellCaches;
 
-            _viewTypes = _cellCaches.Select(x => x.Cell.GetType()).Distinct().Select((x, idx) => new { x, index = idx }).ToDictionary(key => key.x, val => val.index + 2);
+            if(_viewTypes == null)
+            {
+                _viewTypes = _cellCaches.Select(x => x.Cell.GetType()).Distinct().Select((x, idx) => new { x, index = idx }).ToDictionary(key => key.x, val => val.index + 2);
+            }
+            else
+            {
+                var idx = _viewTypes.Values.Max() + 1;
+                foreach(var t in _cellCaches.Select(x=>x.Cell.GetType()).Distinct().Except(_viewTypes.Keys).ToList())
+                {
+                    _viewTypes.Add(t, idx++);
+                }
+            }
         }
 
         /// <summary>

diff --git a/nuget/SettingsView_mac.nuspec b/nuget/SettingsView_mac.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>AiForms.SettingsView</id>
-        <version>0.2.5</version>
+        <version>0.2.6</version>
         <title>SettingsView for Xamarin.Forms</title>
         <authors>kamu</authors>
         <owners>kamu</owners>
@@ -16,12 +16,7 @@ There are various cells such as (LabelCell,ButtonCell,CommandCell,SwitchCell,Che
         <releaseNotes>
 ## Bug fixes
 
-* Null exception on Dispose in SettingsViewRecyclerAdapter (Android).
-
-## Others
-
-* Support .NETStandard2.0
-* Minimum Xamarin.Forms version >= 3.0.0.482510
+* When doing with toggling section visibility and changing cell properties simultaneously, null exception occurs. (Android)
         </releaseNotes>
         <tags>Xamarin.Forms TableView Cell Setting Configuration Option ListView UITableView RecyclerView ReOrder DragDrop</tags>
         <language>en-US</language>