Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix [Android] CollectionView EmptyView SelectionMode=Single on Android #9215

Merged
merged 3 commits into from
Aug 11, 2022
Merged

Fix [Android] CollectionView EmptyView SelectionMode=Single on Android #9215

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3570fea
Fixed null reference when we have EmptyView and SelectionMode = signle
yurkinh Aug 5, 2022
c314989
Moved null check out of loop
yurkinh Aug 8, 2022
3f033b1
Moved adapter null check to the begging of the method
yurkinh Aug 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/Controls/src/Core/Platform/Android/Extensions/RecyclerViewExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ public static void UpdateSelection(this RecyclerView recyclerView, SelectableIte
var mode = selectableItemsView.SelectionMode;
//TODO: on NET7 implement a ISelectableItemsViewAdapter interface on the adapter
var adapter = recyclerView.GetAdapter() as ReorderableItemsViewAdapter<ReorderableItemsView, IGroupableItemsViewSource>;
adapter?.ClearPlatformSelection();
if (adapter == null)
return;

adapter.ClearPlatformSelection();

switch (mode)
{
Expand All @@ -25,13 +28,12 @@ public static void UpdateSelection(this RecyclerView recyclerView, SelectableIte
adapter.MarkPlatformSelection(selectedItem);
return;

case SelectionMode.Multiple:
var selectedItems = selectableItemsView.SelectedItems;

foreach (var item in selectedItems)
{
adapter.MarkPlatformSelection(item);
}
case SelectionMode.Multiple:
var selectedItems = selectableItemsView.SelectedItems;
foreach (var item in selectedItems)
{
adapter.MarkPlatformSelection(item);
}
return;
}
}
Expand Down