Merge pull request #138 from muak/development

implement cell reload
muak · Nov 11, 2020 · 527203d · 527203d
2 parents 16f844d + 40aba9e
commit 527203d
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 4 deletions.
diff --git a/README-ja.md b/README-ja.md
@@ -452,6 +452,11 @@ public class Option
 * IsEnabled
 	* セルを有効にするかどうか。無効にした場合はセル全体の色が薄くなり操作を受け付けなくなります。
 
+### メソッド
+
+* Reload
+  * セルを強制的にリロードします。CustomCell等で動的に内容を変更した後などに使用します。
+
 ### SVGイメージを使用するには
 
 SvgImageSourceのnugetパッケージをインストールすればSVG画像を使用できるようになります。

diff --git a/README.md b/README.md
@@ -449,6 +449,11 @@ public class Option
 * IsEnabled
 	* Whether a cell is enabled. If set to false, the entire cell color will turn translucent and the cell won't accept any operations.
 
+### Methods
+
+* Reload
+  * Reload forcely the cell. This is used after dynamically changing the contents of a cell, such as Custom Cell.
+
 ### To use SVG image
 
 You can use SVG image if SvgImageSource is installed.

diff --git a/Sample/Sample/ViewModels/SurveyPageViewModel.cs b/Sample/Sample/ViewModels/SurveyPageViewModel.cs
@@ -3,12 +3,15 @@
 using System.Collections.ObjectModel;
 using Prism.Mvvm;
 using Prism.Navigation;
+using Reactive.Bindings;
 
 namespace Sample.ViewModels
 {
     public class SurveyPageViewModel:BindableBase, INavigatedAware
     {
         public ObservableCollection<Hoge> ItemsSource { get; set; }
+        public ReactivePropertySlim<string> Text { get; } = new ReactivePropertySlim<string>();
+        public ReactiveCommand ChangeCommand { get; } = new ReactiveCommand();
 
         public SurveyPageViewModel()
         {
@@ -17,6 +20,22 @@ public SurveyPageViewModel()
                 new Hoge{Name="B",Value=2},
                 new Hoge{Name="C",Value=3}
             });
+
+            Text.Value = "テキスト";
+
+            var toggle = true;
+            ChangeCommand.Subscribe(_ => {
+                if (toggle)
+                {
+                    Text.Value = "テキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキストテキスト";
+                }
+                else
+                {
+                    Text.Value = "テキスト";
+                }
+                toggle = !toggle;
+            });
+
         }        
 
         public void OnNavigatedFrom(NavigationParameters parameters)

diff --git a/Sample/Sample/Views/SurveyPage.xaml b/Sample/Sample/Views/SurveyPage.xaml
@@ -5,8 +5,18 @@
     xmlns:sv="clr-namespace:AiForms.Renderers;assembly=SettingsView"
     x:Class="Sample.Views.SurveyPage">
 
+    <Grid>
+        <sv:SettingsView x:Name="settings" HasUnevenRows="True"  HeaderPadding="10" HeaderFontSize="16" HeaderTextVerticalAlign="Center" VerticalOptions="Start" BackgroundColor="AliceBlue" >
+           <sv:Section>
+               <sv:CustomCell x:Name="customCell">
+                   <Label Text="{Binding Text.Value}" />
+               </sv:CustomCell>
+           </sv:Section>
+        </sv:SettingsView>
 
-    <sv:SettingsView x:Name="settings"  HeaderPadding="10" HeaderFontSize="16" HeaderTextVerticalAlign="Center" VerticalOptions="Start" BackgroundColor="AliceBlue" >
-
-    </sv:SettingsView>
+        <Button VerticalOptions="End" Text="Layout" Margin="0,0,0,60" Clicked="Button_Clicked" />
+        <Button VerticalOptions="End" Text="Change" Command="{Binding ChangeCommand}" />
+    </Grid>
+
+
 </ContentPage>
diff --git a/Sample/Sample/Views/SurveyPage.xaml.cs b/Sample/Sample/Views/SurveyPage.xaml.cs
@@ -18,5 +18,13 @@ protected override void OnAppearing()
             settings.ScrollToBottom = true;
             settings.ScrollToTop = true;
         }
+
+        void Button_Clicked(System.Object sender, System.EventArgs e)
+        {
+            customCell.Reload();
+            //var section = settings.Root[0];
+            //var temp = section[0];
+            //section[0] = temp;
+        }
     }
 }
diff --git a/SettingsView.Droid/FormsViewContainer.cs b/SettingsView.Droid/FormsViewContainer.cs
@@ -132,6 +132,12 @@ protected virtual void CreateNewRenderer(Xamarin.Forms.View cell)
 
         public void UpdateCell(Xamarin.Forms.View cell)
         {
+            if(_formsCell == cell && !CustomCell.IsForceLayout)
+            {
+                return;
+            }
+            CustomCell.IsForceLayout = false;
+
             if(_formsCell != null)
             {
                 _formsCell.PropertyChanged -= CellPropertyChanged;

diff --git a/SettingsView.iOS/Cells/CustomCellContent.cs b/SettingsView.iOS/Cells/CustomCellContent.cs
@@ -77,10 +77,12 @@ protected virtual void UpdateIsEnabled()
 
         public virtual void UpdateCell(View cell,UITableView tableView)
         {
-            if(_formsCell == cell)
+            if (_formsCell == cell && !CustomCell.IsForceLayout)
             {
                 return;
             }
+            CustomCell.IsForceLayout = false;
+
             if (_formsCell != null)
             {
                 _formsCell.PropertyChanged -= CellPropertyChanged;

diff --git a/SettingsView/Cells/CellBase.cs b/SettingsView/Cells/CellBase.cs
@@ -19,6 +19,23 @@ public class CellBase:Cell
                 Tapped(this, EventArgs.Empty);
         }
 
+        public virtual void Reload()
+        {
+            if(Section == null)
+            {
+                return;
+            }
+            var index = Section.IndexOf(this);
+            if(index < 0)
+            {
+                return;
+            }
+
+            // raise replase event manually.
+            var temp = Section[index];
+            Section[index] = temp;
+        }
+
         /// <summary>
         /// The title property.
         /// </summary>

diff --git a/SettingsView/Cells/CustomCell.cs b/SettingsView/Cells/CustomCell.cs
@@ -167,5 +167,12 @@ public void SendLongCommand()
                 LongCommand.Execute(BindingContext);
             }
         }
+
+        internal bool IsForceLayout = false;
+        public override void Reload()
+        {
+            IsForceLayout = true;
+            base.Reload();
+        }
     }
 }
diff --git a/nuget/AzurePipelines.nuspec b/nuget/AzurePipelines.nuspec
@@ -21,6 +21,7 @@ There are various cells such as (LabelCell,ButtonCell,CommandCell,SwitchCell,Che
 
 ## New Features
 
+* [Cell] Reload method.
 * [SettingsView] ItemDroppedEvent and ItemDroppedCommand property.
 * [TextPickerCell] IsCircularPicker property. #72
 * [EntryCell] PlaceholderColor property #94