Merge pull request #21 from muak/survey/HeaderView

iOS Header/FooterView fix

Sample/MauiProgram.cs

@@ -26,6 +26,7 @@ public static MauiApp CreateMauiApp()
                     containerRegistry.RegisterForNavigation<ListPage, ListViewModel>();
                     containerRegistry.RegisterForNavigation<CustomHeaderPage, CustomHeaderViewModel>();
                     containerRegistry.RegisterForNavigation<TapSurveyPage, TapSurveyViewModel>();
+                    containerRegistry.RegisterForNavigation<HeaderSurveyPage, HeaderSurveyViewModel>();
                 })
                 .OnAppStart(async(container, navigation) =>
                 {

Sample/Sample.csproj

@@ -78,7 +78,8 @@
 	<ItemGroup>
 	  <PackageReference Include="Prism.DryIoc.Maui" Version="9.0.271-pre" />
 	  <PackageReference Include="ReactiveProperty" Version="9.3.4" />
-	  <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
+	  <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.6" />
+	  <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.6" />
 	</ItemGroup>
 	<ItemGroup>
 	  <Folder Include="Views\" />

Sample/ViewModels/HeaderSurveyViewModel.cs

@@ -0,0 +1,14 @@
+using System;
+using Reactive.Bindings;
+
+namespace Sample.ViewModels;
+
+public class HeaderSurveyViewModel: BindableBase
+{
+    public ReactivePropertySlim<bool> IsShow { get; } = new();
+
+    public HeaderSurveyViewModel()
+    {
+    }
+}
+

Sample/ViewModels/MainViewModel.cs

@@ -48,7 +48,8 @@ public MainViewModel(INavigationService navigationService)
 
                 //Description.Value += "01234567890";
                 //await navigationService.NavigateAsync("ListPage");
-                await navigationService.NavigateAsync("TapSurveyPage");
+                //await navigationService.NavigateAsync("TapSurveyPage");
+                await navigationService.NavigateAsync("HeaderSurveyPage");
             });
 
             AddContentCommand.Subscribe(_ =>

Sample/Views/HeaderSurveyPage.xaml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:sv="clr-namespace:AiForms.Settings;assembly=SettingsView"
+    xmlns:vm="clr-namespace:Sample.ViewModels"
+    x:Class="Sample.Views.HeaderSurveyPage"
+    Title="HeaderSurveyPage"
+    x:DataType="vm:HeaderSurveyViewModel">
+
+    <sv:SettingsView>
+
+        <sv:Section>
+            <sv:Section.HeaderView>
+                <CheckBox IsChecked="{Binding IsShow.Value}" />
+            </sv:Section.HeaderView>
+        </sv:Section>
+
+        <sv:Section IsVisible="{Binding IsShow.Value}">
+            <sv:Section.HeaderView>
+                <HorizontalStackLayout>
+                    <BoxView WidthRequest="30" HeightRequest="30" Color="Bisque" />
+                    <Label Text="Header" />
+                </HorizontalStackLayout>
+            </sv:Section.HeaderView>
+            <sv:Section.FooterView>
+                <Label Text="Footer" />
+            </sv:Section.FooterView>
+            <sv:LabelCell Title="Hoge" ValueText="Abc" />
+            <sv:EntryCell Title="Input" />
+        </sv:Section>
+
+        <sv:Section IsVisible="{Binding IsShow.Value}">
+            <sv:Section.HeaderView>
+                <HorizontalStackLayout>
+                    <BoxView WidthRequest="30" HeightRequest="30" Color="Red" />
+                    <Label Text="Header" />
+                </HorizontalStackLayout>
+            </sv:Section.HeaderView>
+            <sv:Section.FooterView>
+                <Label Text="Footer" />
+            </sv:Section.FooterView>
+            <sv:LabelCell Title="Fuga" ValueText="Xyz" />
+            <sv:EntryCell Title="Input" />
+        </sv:Section>
+
+    </sv:SettingsView>
+
+</ContentPage>

Sample/Views/HeaderSurveyPage.xaml.cs

@@ -0,0 +1,9 @@
+namespace Sample.Views;
+
+public partial class HeaderSurveyPage : ContentPage
+{
+    public HeaderSurveyPage()
+    {
+        InitializeComponent();
+    }
+}

SettingsView/Platforms/iOS/Cells/CustomCellContent.cs

@@ -157,6 +157,7 @@ public virtual void UpdateCell(View newCell, UITableView tableView)
             // Workaround GestureRecognizer bug
             // TODO: if fix this issue, remove the following code.
             // https://github.com/dotnet/maui/issues/17948
+            // https://github.com/dotnet/maui/issues/1718
             newCell.Parent = Application.Current.MainPage;
 
             // If Handler is not generated, generate it.            

SettingsView/Platforms/iOS/CustomHeaderFooterView.cs

@@ -3,6 +3,7 @@
 using AiForms.Settings.Extensions;
 using CoreGraphics;
 using Foundation;
+using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Platform;
 using ObjCRuntime;
 using SpriteKit;
@@ -145,6 +146,7 @@ public virtual void UpdateCell(View newCell,UITableView tableView)
         // Workaround GestureRecognizer bug
         // TODO: if fix this issue, remove the following code.
         // https://github.com/dotnet/maui/issues/17948
+        // https://github.com/dotnet/maui/issues/1718
         newCell.Parent = Application.Current.MainPage;
 
         if (_virtualCell == newCell)
@@ -183,6 +185,7 @@ public virtual void UpdateCell(View newCell,UITableView tableView)
             handler = newCell.Handler as IPlatformViewHandler;
             // If the incoming Cell belongs to another parent, peel it off.
             handler.PlatformView?.RemoveFromSuperview();
+            ArrangeSubView(handler);
         }
         else
         {
@@ -248,16 +251,22 @@ protected virtual IPlatformViewHandler GetNewHandler()
         }
 
         var newHandler = _virtualCell.ToHandler(_virtualCell.FindMauiContext());
-        ContentView.AddSubview(newHandler.PlatformView);
 
-        var native = newHandler.PlatformView;
+        ArrangeSubView(newHandler);
+
+        return newHandler;
+    }
+
+    protected virtual void ArrangeSubView(IPlatformViewHandler handler)
+    {
+        ContentView.AddSubview(handler.PlatformView);
+
+        var native = handler.PlatformView;
         native.TranslatesAutoresizingMaskIntoConstraints = false;
 
         native.TopAnchor.ConstraintEqualTo(ContentView.TopAnchor).Active = true;
         native.LeftAnchor.ConstraintEqualTo(ContentView.LeftAnchor).Active = true;
         native.BottomAnchor.ConstraintEqualTo(ContentView.BottomAnchor).Active = true;
         native.RightAnchor.ConstraintEqualTo(ContentView.RightAnchor).Active = true;
-
-        return newHandler;
     }
 }

SettingsView/SettingsView.csproj

@@ -20,7 +20,7 @@
 		<Description>This is a flexible TableView specialized in settings for Android / iOS. 
 There are various cells such as (LabelCell,ButtonCell,CommandCell,SwitchCell,CheckboxCell,RadioCell,PickerCell,EntryCell,NumberPickerCell,TimePickerCell,DatePickerCell,CustomCell)</Description>
 		<PackageReleaseNotes>
-			Fix TapGestureRecognizer issue
+			Fix iOS Header/FooterView issue
         </PackageReleaseNotes>
 		<PackageTags>MAUI TableView Cell Setting Configuration Option ListView UITableView RecyclerView ReOrder DragDrop</PackageTags>
 	</PropertyGroup>
@@ -141,6 +141,7 @@ There are various cells such as (LabelCell,ButtonCell,CommandCell,SwitchCell,Che
 	  <AndroidResource Include="Platforms\Android\Resources\values\attrs.xml" />
 	</ItemGroup>
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
+	  <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.6" />
+	  <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.6" />
 	</ItemGroup>
 </Project>