Revert "[Android] fix item indices and item count in a ListView (#15306…

…)" (#15473) This reverts commit 48a7087.
xamarin · Jul 14, 2022 · 04ace58 · 04ace58
1 parent 93efb39
commit 04ace58
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 94 deletions.
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue15305.xaml b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue15305.xaml
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue15305.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue15305.xaml.cs
diff --git a/...ssues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/...ssues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@ -1864,9 +1864,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Issue11954.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue13918.xaml.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue13794.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Issue15305.xaml.cs">
-      <DependentUpon>Issue15305.xaml</DependentUpon>
-    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Controls\MyCollectionView.xaml.cs">
       <DependentUpon>MyCollectionView.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -2425,9 +2422,6 @@
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue13918.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue15305.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Controls\MyCollectionView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>

diff --git a/Xamarin.Forms.Platform.Android/CellAdapter.cs b/Xamarin.Forms.Platform.Android/CellAdapter.cs
@@ -132,12 +132,13 @@ bool AActionMode.ICallback.OnPrepareActionMode(AActionMode mode, IMenu menu)
 
 		public void OnItemClick(AdapterView parent, AView view, int position, long id)
 		{
-			var listView = parent as AListView;
-			if (listView != null)
-				position -= listView.HeaderViewsCount;
-
 			if (_actionMode != null || _supportActionMode != null)
+			{
+				var listView = parent as AListView;
+				if (listView != null)
+					position -= listView.HeaderViewsCount;
 				HandleContextMode(view, position);
+			}
 			else
 				HandleItemClick(parent, view, position, id);
 		}

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs b/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs
@@ -481,6 +481,9 @@ protected override void HandleItemClick(AdapterView parent, AView view, int posi
 				cell = (Cell)(cellOwner as INativeElementView)?.Element;
 			}
 
+			// All our ListView's have called AddHeaderView. This effectively becomes index 0, so our index 0 is index 1 to the listView.
+			position--;
+
 			if (position < 0 || position >= Count)
 				return;
 

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ListViewRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/ListViewRenderer.cs
@@ -365,14 +365,7 @@ void UpdateFooter()
 			}
 
 			if (footer == null)
-			{
-				if (_footerView.ChildCount == 0)
-				{
-					AListView nativeListView = Control;
-					nativeListView.RemoveFooterView(_adapter.FooterView);
-				}
 				return;
-			}
 
 			if (_footerRenderer != null)
 				_footerRenderer.SetElement(footer);
@@ -404,14 +397,7 @@ void UpdateHeader()
 			}
 
 			if (header == null)
-			{
-				if (_headerView.ChildCount == 0)
-				{
-					AListView nativeListView = Control;
-					nativeListView.RemoveHeaderView(_adapter.HeaderView);
-				}
 				return;
-			}
 
 			if (_headerRenderer != null)
 				_headerRenderer.SetElement(header);