Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 21 additions & 20 deletions samples/todoapp/TodoApp.MAUI/MainPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,30 @@
</Grid.ColumnDefinitions>

<!-- List of items -->
<ListView ItemTapped="OnListItemTapped" ItemsSource="{Binding Items}">
<ListView.ItemTemplate>
<CollectionView
ItemsSource="{Binding Items}"
SelectionChanged="OnListItemTapped"
SelectionMode="Single">
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="models:TodoItem">
<ViewCell>
<Grid Style="{StaticResource listItemContainer}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid Style="{StaticResource listItemContainer}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<Label Style="{StaticResource listItemTitle}" Text="{Binding Title}" />
<Image
Grid.Column="1"
IsVisible="{Binding IsComplete}"
Style="{StaticResource listItemIcon}" />
</Grid>
</ViewCell>
<Label Style="{StaticResource listItemTitle}" Text="{Binding Title}" />
<Image
Grid.Column="1"
IsVisible="{Binding IsComplete}"
Style="{StaticResource listItemIcon}" />
</Grid>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
</CollectionView.ItemTemplate>
</CollectionView>

<Grid Grid.Row="1" ColumnDefinitions="*,Auto">
<Border Grid.Column="0" Style="{StaticResource roundedCornerFrame}">
Expand Down
6 changes: 3 additions & 3 deletions samples/todoapp/TodoApp.MAUI/MainPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ protected override void OnAppearing()
this._viewModel.RefreshItemsCommand.Execute(null);
}

public void OnListItemTapped(object sender, ItemTappedEventArgs e)
public void OnListItemTapped(object sender, SelectionChangedEventArgs e)
{
if (e.Item is TodoItem item)
if (e.CurrentSelection.FirstOrDefault() is TodoItem item)
{
this._viewModel.UpdateItemCommand.Execute(item.Id);
}

if (sender is ListView itemList)
if (sender is CollectionView itemList)
{
itemList.SelectedItem = null;
}
Expand Down
5 changes: 0 additions & 5 deletions samples/todoapp/TodoApp.MAUI/Resources/Styles/Styles.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -278,11 +278,6 @@
<Setter Property="HorizontalTextAlignment" Value="Center" />
</Style>

<Style TargetType="ListView">
<Setter Property="SeparatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
<Setter Property="RefreshControlColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
</Style>

<Style TargetType="Picker">
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
<Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
Expand Down
Loading