|
38 | 38 | RefreshCommand="{Binding RefreshCommand}"> |
39 | 39 | <pullToRefresh:SfPullToRefresh.PullableContent> |
40 | 40 | <ScrollView> |
41 | | - <VerticalStackLayout Spacing="{StaticResource LayoutSpacing}" Padding="{StaticResource LayoutPadding}"> |
42 | | - <Label Text="Task Categories" Style="{StaticResource Title2}" SemanticProperties.HeadingLevel="Level1"/> |
43 | | - <controls:CategoryChart /> |
44 | | - <Label Text="Projects" Style="{StaticResource Title2}" SemanticProperties.HeadingLevel="Level1"/> |
45 | | - <ScrollView Orientation="Horizontal" Margin="-30,0"> |
46 | | - <HorizontalStackLayout |
47 | | - Spacing="15" Padding="30,0" |
48 | | - BindableLayout.ItemsSource="{Binding Projects}"> |
49 | | - <BindableLayout.ItemTemplate> |
50 | | - <DataTemplate x:DataType="models:Project"> |
51 | | - <controls:ProjectCardView WidthRequest="200"> |
52 | | - <controls:ProjectCardView.GestureRecognizers> |
53 | | - <TapGestureRecognizer Command="{Binding NavigateToProjectCommand, Source={RelativeSource AncestorType={x:Type pageModels:MainPageModel}}, x:DataType=pageModels:MainPageModel}" CommandParameter="{Binding .}"/> |
54 | | - </controls:ProjectCardView.GestureRecognizers> |
55 | | - </controls:ProjectCardView> |
56 | | - </DataTemplate> |
57 | | - </BindableLayout.ItemTemplate> |
58 | | - </HorizontalStackLayout> |
59 | | - </ScrollView> |
60 | | - <Grid MinimumHeightRequest="44"> |
| 41 | + <Grid RowSpacing="{StaticResource LayoutSpacing}" Padding="{StaticResource LayoutPadding}"> |
| 42 | + <Grid.RowDefinitions> |
| 43 | + <RowDefinition Height="Auto" /> |
| 44 | + <RowDefinition Height="Auto" /> |
| 45 | + <RowDefinition Height="Auto" /> |
| 46 | + <RowDefinition Height="Auto" /> |
| 47 | + <RowDefinition Height="Auto" /> |
| 48 | + <RowDefinition Height="Auto" /> |
| 49 | + </Grid.RowDefinitions> |
| 50 | + |
| 51 | + <Label Grid.Row="0" Text="Task Categories" Style="{StaticResource Title2}" SemanticProperties.HeadingLevel="Level1"/> |
| 52 | + <controls:CategoryChart Grid.Row="1" /> |
| 53 | + <Label Grid.Row="2" Text="Projects" Style="{StaticResource Title2}" SemanticProperties.HeadingLevel="Level1"/> |
| 54 | + <CollectionView Grid.Row="3" ItemsSource="{Binding Projects}" |
| 55 | + Margin="-7.5,0" |
| 56 | + MinimumHeightRequest="250" |
| 57 | + x:Name="ProjectsCollectionView" |
| 58 | + SelectionMode="Single" |
| 59 | + SelectedItem="{Binding SelectedProject}" |
| 60 | + SelectionChangedCommand="{Binding NavigateToProjectCommand, Source={RelativeSource AncestorType={x:Type pageModels:MainPageModel}}, x:DataType=pageModels:MainPageModel}" |
| 61 | + SelectionChangedCommandParameter="{Binding SelectedProject}"> |
| 62 | + <CollectionView.ItemsLayout> |
| 63 | + <LinearItemsLayout Orientation="Horizontal" ItemSpacing="7.5"/> |
| 64 | + </CollectionView.ItemsLayout> |
| 65 | + <CollectionView.ItemTemplate> |
| 66 | + <DataTemplate x:DataType="models:Project"> |
| 67 | + <controls:ProjectCardView WidthRequest="200" /> |
| 68 | + </DataTemplate> |
| 69 | + </CollectionView.ItemTemplate> |
| 70 | + </CollectionView> |
| 71 | + <Grid Grid.Row="4" MinimumHeightRequest="44"> |
61 | 72 | <Label Text="Tasks" Style="{StaticResource Title2}" VerticalOptions="Center" SemanticProperties.HeadingLevel="Level1"/> |
62 | 73 | <ImageButton |
63 | 74 | Source="{StaticResource IconClean}" |
|
70 | 81 | Command="{Binding CleanTasksCommand}" |
71 | 82 | SemanticProperties.Description="Clean tasks" /> |
72 | 83 | </Grid> |
73 | | - <VerticalStackLayout Spacing="15" |
| 84 | + <VerticalStackLayout Grid.Row="5" Spacing="15" |
74 | 85 | BindableLayout.ItemsSource="{Binding Tasks}"> |
75 | 86 | <BindableLayout.ItemTemplate> |
76 | 87 | <DataTemplate> |
77 | 88 | <controls:TaskView TaskCompletedCommand="{Binding TaskCompletedCommand, Source={RelativeSource AncestorType={x:Type pageModels:MainPageModel}}, x:DataType=pageModels:MainPageModel}" /> |
78 | 89 | </DataTemplate> |
79 | 90 | </BindableLayout.ItemTemplate> |
80 | 91 | </VerticalStackLayout> |
81 | | - </VerticalStackLayout> |
| 92 | + </Grid> |
82 | 93 | </ScrollView> |
83 | 94 | </pullToRefresh:SfPullToRefresh.PullableContent> |
84 | 95 | </pullToRefresh:SfPullToRefresh> |
|
0 commit comments