more progress. Sould fix muak/AiForms.SettingsView#118

src/SettingsView.Droid/BaseCell/BaseAiDescriptionCell.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using Android.Runtime;
 using Jakar.SettingsView.Droid.Controls;
+using Jakar.SettingsView.Droid.Controls.Core;
 using Xamarin.Forms;
 using AContext = Android.Content.Context;
 

src/SettingsView.Droid/BaseCell/BaseAiTitledCell.cs

@@ -3,6 +3,7 @@
 using Android.Runtime;
 using Android.Widget;
 using Jakar.SettingsView.Droid.Controls;
+using Jakar.SettingsView.Droid.Controls.Core;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 using AContext = Android.Content.Context;

src/SettingsView.Droid/BaseCell/BaseAiValueCell.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using Android.Runtime;
 using Jakar.SettingsView.Droid.Controls;
+using Jakar.SettingsView.Droid.Controls.Core;
 using Xamarin.Forms;
 using AContext = Android.Content.Context;
 

src/SettingsView.Droid/BaseCell/BaseValueCell.cs

@@ -4,6 +4,7 @@
 using Android.Views;
 using Android.Widget;
 using Jakar.SettingsView.Droid.Controls;
+using Jakar.SettingsView.Droid.Controls.Core;
 using Jakar.SettingsView.Droid.Extensions;
 using Jakar.SettingsView.Shared;
 using Jakar.SettingsView.Shared.Misc;

src/SettingsView.Droid/Controls/BaseTextView.cs → src/SettingsView.Droid/Controls/Core/BaseTextView.cs

@@ -3,8 +3,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Android.Util;
 using Android.Widget;
-using Jakar.SettingsView.Droid.BaseCell;
-using Jakar.SettingsView.Shared.CellBase;
 using Jakar.SettingsView.Shared.Config;
 using Jakar.SettingsView.Shared.Interfaces;
 using Xamarin.Forms;
@@ -13,10 +11,9 @@
 using AContext = Android.Content.Context;
 using AView = Android.Views.View;
 using BaseCellView = Jakar.SettingsView.Droid.BaseCell.BaseCellView;
-using AiEntryCell = Jakar.SettingsView.Shared.Cells.EntryCell;
 
 #nullable enable
-namespace Jakar.SettingsView.Droid.Controls
+namespace Jakar.SettingsView.Droid.Controls.Core
 {
 	[SuppressMessage("ReSharper", "VirtualMemberCallInConstructor")]
 	[Android.Runtime.Preserve(AllMembers = true)]

src/SettingsView.Droid/Controls/DescriptionView.cs → src/SettingsView.Droid/Controls/Core/DescriptionView.cs

@@ -11,7 +11,7 @@
 using TextAlignment = Xamarin.Forms.TextAlignment;
 
 #nullable enable
-namespace Jakar.SettingsView.Droid.Controls
+namespace Jakar.SettingsView.Droid.Controls.Core
 {
 	[Android.Runtime.Preserve(AllMembers = true)]
 	public class DescriptionView : BaseTextView

src/SettingsView.Droid/Controls/HintView.cs → src/SettingsView.Droid/Controls/Core/HintView.cs

@@ -11,7 +11,7 @@
 using TextAlignment = Xamarin.Forms.TextAlignment;
 
 #nullable enable
-namespace Jakar.SettingsView.Droid.Controls
+namespace Jakar.SettingsView.Droid.Controls.Core
 {
 	public class HintView : BaseTextView
 	{

src/SettingsView.Droid/Controls/TitleView.cs → src/SettingsView.Droid/Controls/Core/TitleView.cs

@@ -9,7 +9,7 @@
 using BaseCellView = Jakar.SettingsView.Droid.BaseCell.BaseCellView;
 
 #nullable enable
-namespace Jakar.SettingsView.Droid.Controls
+namespace Jakar.SettingsView.Droid.Controls.Core
 {
 	[Android.Runtime.Preserve(AllMembers = true)]
 	public class TitleView : BaseTextView

src/SettingsView.Droid/Controls/ValueView.cs → src/SettingsView.Droid/Controls/Core/ValueView.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.Runtime.CompilerServices;
 using Android.Content;
 using Android.Util;
 using Android.Views;
@@ -12,7 +11,7 @@
 using TextAlignment = Xamarin.Forms.TextAlignment;
 
 #nullable enable
-namespace Jakar.SettingsView.Droid.Controls
+namespace Jakar.SettingsView.Droid.Controls.Core
 {
 	[Android.Runtime.Preserve(AllMembers = true)]
 	public class ValueView : BaseTextView

src/SettingsView.Droid/HeaderFooterContainer.cs → src/SettingsView.Droid/Controls/HeaderFooterContainer.cs

@@ -8,13 +8,14 @@
 using Android.Widget;
 using Jakar.SettingsView.Shared.Config;
 using Jakar.SettingsView.Shared.Interfaces;
+using Jakar.SettingsView.Shared.Misc;
 using Jakar.SettingsView.Shared.sv;
 using Xamarin.Forms;
 using Xamarin.Forms.Internals;
 using Xamarin.Forms.Platform.Android;
 
 #nullable enable
-namespace Jakar.SettingsView.Droid
+namespace Jakar.SettingsView.Droid.Controls
 {
 	[Android.Runtime.Preserve(AllMembers = true)]
 	public class HeaderFooterContainer : FrameLayout, INativeElementView
@@ -27,7 +28,7 @@ public class HeaderFooterContainer : FrameLayout, INativeElementView
 		protected IVisualElementRenderer? _Renderer { get; set; }
 
 
-		private ISectionFooterHeader? _content;
+		protected ISectionFooterHeader? _content;
 
 		protected ISectionFooterHeader? _Content
 		{
@@ -64,22 +65,21 @@ protected ISectionFooterHeader? _Content
 					{
 						_content = value;
 						_content.DisableLayout = true;
-						foreach ( var element in _content.Descendants() )
+						foreach ( var element in _content.View.Descendants() )
 						{
 							if ( element is VisualElement v ) v.DisableLayout = true;
 						}
 
 						renderer.SetElement(_content.View);
-
 						Platform.SetRenderer(_content.View, _Renderer);
 
 						_content.DisableLayout = false;
-						foreach ( var element in _content.Descendants() )
+						foreach ( var element in _content.View.Descendants() )
 						{
 							if ( element is VisualElement v ) v.DisableLayout = false;
 						}
 
-						var viewAsLayout = _Content as Layout;
+						var viewAsLayout = _content.View as Layout;
 						viewAsLayout?.ForceLayout();
 
 						Update();
@@ -143,7 +143,6 @@ protected override void OnLayout( bool changed,
 
 			_Renderer.UpdateLayout();
 		}
-
 		protected override void OnMeasure( int widthMeasureSpec, int heightMeasureSpec )
 		{
 			int width = MeasureSpec.GetSize(widthMeasureSpec);
@@ -174,16 +173,16 @@ protected override void OnMeasure( int widthMeasureSpec, int heightMeasureSpec )
 
 		public virtual void CellPropertyChanged( object sender, PropertyChangedEventArgs e )
 		{
-			if ( e.PropertyName == Cell.IsEnabledProperty.PropertyName ) { UpdateIsEnabled(); }
-			else if ( e.PropertyName == Section.TitleProperty.PropertyName ) { UpdateTitle(); }
-			else if ( e.PropertyName == Section.TextColorProperty.PropertyName ) { UpdateTextColor(); }
-			else if ( e.PropertyName == VisualElement.IsEnabledProperty.PropertyName ) { UpdateIsEnabled(); }
-			else if ( e.PropertyName == HeaderView.IsCollapsedProperty.PropertyName ) { ShowHideSection(); }
-			else if ( e.PropertyName == HeaderView.IsCollapsibleProperty.PropertyName ) { UpdateIsCollapsible(); }
+			if ( e.IsEqual(Cell.IsEnabledProperty) ) { UpdateIsEnabled(); }
+			else if ( e.IsEqual(Section.TitleProperty) ) { UpdateTitle(); }
+			else if ( e.IsEqual(Section.TextColorProperty) ) { UpdateTextColor(); }
+			else if ( e.IsEqual(VisualElement.IsEnabledProperty) ) { UpdateIsEnabled(); }
+			else if ( e.IsEqual(HeaderView.IsCollapsedProperty) ) { ShowHideSection(); }
+			else if ( e.IsEqual(HeaderView.IsCollapsibleProperty) ) { UpdateIsCollapsible(); }
 		}
-		private void UpdateIsCollapsible() { Clickable = _Header?.IsCollapsible ?? false; }
-		private void ShowHideSection() { _Content?.Section?.ShowHideSection(); }
-		private void UpdateTitle()
+		protected void UpdateIsCollapsible() { Clickable = _Header?.IsCollapsible ?? false; }
+		protected void ShowHideSection() { _Content?.Section?.ShowHideSection(); }
+		protected void UpdateTitle()
 		{
 			if ( _Content is null ) throw new NullReferenceException(nameof(_Content));
 			if ( _Content.Section is null ) throw new NullReferenceException(nameof(_Content.Section));
@@ -192,7 +191,7 @@ private void UpdateTitle()
 
 			if ( _Content is ISectionFooter footer ) { footer.SetText(_Content.Section.FooterText); }
 		}
-		private void UpdateTextColor()
+		protected void UpdateTextColor()
 		{
 			if ( _Content is null ) throw new NullReferenceException(nameof(_Content));
 			if ( _Content.Section is null ) throw new NullReferenceException(nameof(_Content.Section));

src/SettingsView.Droid/Jakar.SettingsView.Droid.csproj

@@ -53,13 +53,13 @@
     <Compile Include="BaseCell\BaseAiDescriptionCell.cs" />
     <Compile Include="BaseCell\BaseAiTitledCell.cs" />
     <Compile Include="BaseCell\BaseAiValueCell.cs" />
-    <Compile Include="Controls\BaseTextView.cs" />
-    <Compile Include="Controls\DescriptionView.cs" />
-    <Compile Include="Controls\HintView.cs" />
+    <Compile Include="Controls\Core\BaseTextView.cs" />
+    <Compile Include="Controls\Core\DescriptionView.cs" />
+    <Compile Include="Controls\Core\HintView.cs" />
     <Compile Include="Controls\IconView.cs" />
     <Compile Include="Controls\RadioCheck.cs" />
-    <Compile Include="Controls\TitleView.cs" />
-    <Compile Include="Controls\ValueView.cs" />
+    <Compile Include="Controls\Core\TitleView.cs" />
+    <Compile Include="Controls\Core\ValueView.cs" />
     <Compile Include="Extensions\LayoutExtensions.cs" />
     <Compile Include="GetIcons.cs" />
     <Compile Include="Interfaces\ICellRender.cs" />
@@ -95,7 +95,7 @@
     <Compile Include="ViewHolders.cs" />
     <Compile Include="FormsViewContainer.cs" />
     <Compile Include="Cells\CustomCellRenderer.cs" />
-    <Compile Include="HeaderFooterContainer.cs" />
+    <Compile Include="Controls\HeaderFooterContainer.cs" />
     <Compile Include="FontUtility.cs" />
     <Compile Include="SettingsViewLayoutManager.cs" />
   </ItemGroup>
@@ -186,5 +186,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\ExpandSolidWhite.png" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>

src/SettingsView.Droid/SettingsViewRecyclerAdapter.cs

@@ -5,6 +5,7 @@
 using Android.Views;
 using Android.Widget;
 using AndroidX.RecyclerView.Widget;
+using Jakar.SettingsView.Droid.Controls;
 using Jakar.SettingsView.Droid.Extensions;
 using Jakar.SettingsView.Shared;
 using Jakar.SettingsView.Shared.Config;

src/SettingsView.Droid/ViewHolders.cs

@@ -1,6 +1,7 @@
 using System;
 using Android.Widget;
 using AndroidX.RecyclerView.Widget;
+using Jakar.SettingsView.Droid.Controls;
 using Xamarin.Forms;
 using AView = Android.Views.View;
 

src/SettingsView.iOS/BaseCell/BaseAiDescriptionCell.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel;
 using Jakar.SettingsView.iOS.Controls;
+using Jakar.SettingsView.iOS.Controls.Core;
 using Jakar.SettingsView.Shared.Config;
 using UIKit;
 using Xamarin.Forms;

src/SettingsView.iOS/BaseCell/BaseAiTitledCell.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel;
 using Jakar.SettingsView.iOS.Controls;
+using Jakar.SettingsView.iOS.Controls.Core;
 using UIKit;
 using Xamarin.Forms;
 

src/SettingsView.iOS/BaseCell/BaseAiValueCell.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel;
 using Jakar.SettingsView.iOS.Controls;
+using Jakar.SettingsView.iOS.Controls.Core;
 using Xamarin.Forms;
 
 #nullable enable

src/SettingsView.iOS/BaseCell/BaseCellView.cs

@@ -14,7 +14,7 @@
 #nullable enable
 namespace Jakar.SettingsView.iOS.BaseCell
 {
-	[Foundation.Preserve(AllMembers = true)]
+	[Preserve(AllMembers = true)]
 	public abstract class BaseCellView : CellTableViewCell
 	{
 		// internal NSLayoutConstraint LeftMarginConstraint { get; private set; }

src/SettingsView.iOS/BaseCell/BasePickerCell.cs

@@ -2,13 +2,13 @@
 
 using System.Diagnostics.CodeAnalysis;
 using Foundation;
-using Jakar.SettingsView.iOS.OLD_Cells;
+using Jakar.SettingsView.iOS.Controls;
 using UIKit;
 using Xamarin.Forms;
 
 namespace Jakar.SettingsView.iOS.BaseCell
 {
-	[Foundation.Preserve(AllMembers = true)]
+	[Preserve(AllMembers = true)]
 	public abstract class BasePickerCell : BaseAiValueCell
 	{
 		protected NoCaretField _DummyField { get; set; }

src/SettingsView.iOS/BaseCell/BaseValueCell.cs

@@ -1,5 +1,6 @@
 using System;
 using Jakar.SettingsView.iOS.Controls;
+using Jakar.SettingsView.iOS.Controls.Core;
 using Jakar.SettingsView.Shared.Config;
 using Jakar.SettingsView.Shared.Misc;
 using UIKit;