Skip to content

Commit

Permalink
add datatype to views that don't have direct VMs of their own
Browse files Browse the repository at this point in the history
  • Loading branch information
@edgiardina
edgiardina committed Mar 26, 2024
1 parent af32c8d commit 68d53a5
Show file tree
Hide file tree
Showing 6 changed files with 112 additions and 53 deletions.
4 changes: 3 additions & 1 deletion Views/DataTemplates/ActivityFeedRankChangeDataTemplate.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
xmlns:converters="clr-namespace:Ifpa.Converters"
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
x:Class="Ifpa.Views.DataTemplates.ActivityFeedRankChangeDataTemplate"
xmlns:local="clr-namespace:Ifpa">
xmlns:local="clr-namespace:Ifpa"
xmlns:models="clr-namespace:Ifpa.Models"
x:DataType="models:ActivityFeedItem">
<StackLayout>
<Grid Padding="10"
ColumnDefinitions="35, *">
Expand Down
90 changes: 58 additions & 32 deletions Views/DataTemplates/ActivityFeedTournamentResultDataTemplate.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<DataTemplate xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit" x:Class="Ifpa.Views.DataTemplates.ActivityFeedTournamentResultDataTemplate" xmlns:local="clr-namespace:Ifpa">
<StackLayout>
<Grid Padding="10" ColumnDefinitions="35, *">
<Grid.Resources>
<ResourceDictionary>
<toolkit:InvertedBoolConverter x:Key="inverter" />
</ResourceDictionary>
</Grid.Resources>
<Image Grid.Column="0" Source="ribbon.png" HeightRequest="25" WidthRequest="25">
<Image.Behaviors>
<toolkit:IconTintColorBehavior TintColor="{StaticResource IconAccentColor}" />
</Image.Behaviors>
</Image>
<StackLayout Grid.Column="1" HorizontalOptions="FillAndExpand" Padding="10,0,0,0">
<Label Text="{x:Static local:Strings.ActivityFeedTournamentResultDataTemplate_TournamentResultPosted}" FontAttributes="Bold" />
<Label FontSize="Small">
<Label.FormattedText>
<FormattedString>
<FormattedString.Spans>
<Span Text="{x:Static local:Strings.ActivityFeedTournamentResultDataTemplate_TournamentResultsFor}" TextColor="{DynamicResource SecondaryTextColor}" />
<Span Text="{Binding Description, Mode=OneWay}" />
<Span Text="{x:Static local:Strings.ActivityFeedTournamentResultDataTemplate_WerePostedToYourProfile}" TextColor="{DynamicResource SecondaryTextColor}" />
</FormattedString.Spans>
</FormattedString>
</Label.FormattedText>
</Label>
<Label LineBreakMode="NoWrap" FontSize="Micro" Text="{Binding CreatedDateTime, StringFormat='{0:d}'}" TextColor="{DynamicResource SecondaryTextColor}" />
</StackLayout>
<BoxView Color="{StaticResource IconAccentColor}" Grid.ColumnSpan="2" Margin="10,0,0,0" IsVisible="{Binding HasBeenSeen, Mode=OneWay, Converter={StaticResource inverter}}" CornerRadius="6" WidthRequest="12" HeightRequest="12" VerticalOptions="Center" HorizontalOptions="End" />
</Grid>
<BoxView Style="{StaticResource BoxSeperator}" />
</StackLayout>
<DataTemplate xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
x:Class="Ifpa.Views.DataTemplates.ActivityFeedTournamentResultDataTemplate"
xmlns:local="clr-namespace:Ifpa"
xmlns:models="clr-namespace:Ifpa.Models"
x:DataType="models:ActivityFeedItem">
<StackLayout>
<Grid Padding="10"
ColumnDefinitions="35, *">
<Grid.Resources>
<ResourceDictionary>
<toolkit:InvertedBoolConverter x:Key="inverter" />
</ResourceDictionary>
</Grid.Resources>
<Image Grid.Column="0"
Source="ribbon.png"
HeightRequest="25"
WidthRequest="25">
<Image.Behaviors>
<toolkit:IconTintColorBehavior TintColor="{StaticResource IconAccentColor}" />
</Image.Behaviors>
</Image>
<StackLayout Grid.Column="1"
HorizontalOptions="FillAndExpand"
Padding="10,0,0,0">
<Label Text="{x:Static local:Strings.ActivityFeedTournamentResultDataTemplate_TournamentResultPosted}"
FontAttributes="Bold" />
<Label FontSize="Small">
<Label.FormattedText>
<FormattedString>
<FormattedString.Spans>
<Span Text="{x:Static local:Strings.ActivityFeedTournamentResultDataTemplate_TournamentResultsFor}"
TextColor="{DynamicResource SecondaryTextColor}" />
<Span Text="{Binding Description, Mode=OneWay}" />
<Span Text="{x:Static local:Strings.ActivityFeedTournamentResultDataTemplate_WerePostedToYourProfile}"
TextColor="{DynamicResource SecondaryTextColor}" />
</FormattedString.Spans>
</FormattedString>
</Label.FormattedText>
</Label>
<Label LineBreakMode="NoWrap"
FontSize="Micro"
Text="{Binding CreatedDateTime, StringFormat='{0:d}'}"
TextColor="{DynamicResource SecondaryTextColor}" />
</StackLayout>
<BoxView Color="{StaticResource IconAccentColor}"
Grid.ColumnSpan="2"
Margin="10,0,0,0"
IsVisible="{Binding HasBeenSeen, Mode=OneWay, Converter={StaticResource inverter}}"
CornerRadius="6"
WidthRequest="12"
HeightRequest="12"
VerticalOptions="Center"
HorizontalOptions="End" />
</Grid>
<BoxView Style="{StaticResource BoxSeperator}" />
</StackLayout>
</DataTemplate>
61 changes: 44 additions & 17 deletions Views/DataTemplates/PlayerResultDataTemplate.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<DataTemplate xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:local="clr-namespace:Ifpa.Converters" x:Class="Ifpa.Views.DataTemplates.PlayerResultDataTemplate">
<VerticalStackLayout>
<VerticalStackLayout Padding="15,10">
<VerticalStackLayout.Resources>
<local:IntToOrdinalStringConverter x:Key="intToOrdinalString" />
</VerticalStackLayout.Resources>
<Grid ColumnDefinitions="*,100">
<Label Grid.Column="0" Text="{Binding TournamentName}" FontSize="16" HorizontalTextAlignment="Start" />
<Label Grid.Column="1" LineBreakMode="NoWrap" HorizontalTextAlignment="End" MinimumHeightRequest="40" Text="{Binding Position, Converter={StaticResource intToOrdinalString}}" FontSize="24" />
</Grid>
<Grid ColumnDefinitions="*,*,*">
<Label Grid.Column="0" LineBreakMode="NoWrap" HorizontalTextAlignment="Start" FontSize="12" Text="{Binding EventName}" TextColor="{DynamicResource SecondaryTextColor}" />
<Label Grid.Column="1" Text="{Binding EventDate, StringFormat='{0:d}'}" FontSize="12" TextColor="{DynamicResource SecondaryTextColor}" HorizontalTextAlignment="Center" />
<Label Grid.Column="2" LineBreakMode="NoWrap" HorizontalTextAlignment="End" FontSize="12" Text="{Binding CurrentPoints, StringFormat='{0:0.00}'}" TextColor="{DynamicResource SecondaryTextColor}" />
</Grid>
<DataTemplate xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:Ifpa.Converters"
x:Class="Ifpa.Views.DataTemplates.PlayerResultDataTemplate"
xmlns:ifpaplayer="clr-namespace:PinballApi.Models.WPPR.v2.Players;assembly=PinballApi"
x:DataType="ifpaplayer:PlayerResult">
<VerticalStackLayout>
<VerticalStackLayout Padding="15,10">
<VerticalStackLayout.Resources>
<local:IntToOrdinalStringConverter x:Key="intToOrdinalString" />
</VerticalStackLayout.Resources>
<Grid ColumnDefinitions="*,100">
<Label Grid.Column="0"
Text="{Binding TournamentName}"
FontSize="16"
HorizontalTextAlignment="Start" />
<Label Grid.Column="1"
LineBreakMode="NoWrap"
HorizontalTextAlignment="End"
MinimumHeightRequest="40"
Text="{Binding Position, Converter={StaticResource intToOrdinalString}}"
FontSize="24" />
</Grid>
<Grid ColumnDefinitions="*,*,*">
<Label Grid.Column="0"
LineBreakMode="NoWrap"
HorizontalTextAlignment="Start"
FontSize="12"
Text="{Binding EventName}"
TextColor="{DynamicResource SecondaryTextColor}" />
<Label Grid.Column="1"
Text="{Binding EventDate, StringFormat='{0:d}'}"
FontSize="12"
TextColor="{DynamicResource SecondaryTextColor}"
HorizontalTextAlignment="Center" />
<Label Grid.Column="2"
LineBreakMode="NoWrap"
HorizontalTextAlignment="End"
FontSize="12"
Text="{Binding CurrentPoints, StringFormat='{0:0.00}'}"
TextColor="{DynamicResource SecondaryTextColor}" />
</Grid>
</VerticalStackLayout>
<BoxView Style="{StaticResource BoxSeperator}" />
</VerticalStackLayout>
<BoxView Style="{StaticResource BoxSeperator}" />
</VerticalStackLayout>
</DataTemplate>
3 changes: 2 additions & 1 deletion Views/MoreItemsPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
xmlns:views="clr-namespace:Ifpa.Views"
x:Class="Ifpa.Views.MoreItemsPage"
xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
Title="{x:Static local:Strings.MoreItemsPage_More}">
Title="{x:Static local:Strings.MoreItemsPage_More}"
x:DataType="views:MoreItemsMenuItem">
<CollectionView x:Name="MoreItemsCollection"
x:FieldModifier="public"
SelectionChanged="MoreItemsCollection_SelectionChanged"
Expand Down
4 changes: 3 additions & 1 deletion Views/RankingsFilterModalPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
Shell.PresentationMode="ModalAnimated"
ios:Page.ModalPresentationStyle="PageSheet"
xmlns:local="clr-namespace:Ifpa">
xmlns:local="clr-namespace:Ifpa"
xmlns:vm="clr-namespace:Ifpa.ViewModels"
x:DataType="vm:RankingsViewModel">
<ContentPage.Content>
<Grid Padding="10,10,10,10"
VerticalOptions="CenterAndExpand"
Expand Down
3 changes: 2 additions & 1 deletion Views/TournamentInfoPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
ios:Page.ModalPresentationStyle="PageSheet"
xmlns:local="clr-namespace:Ifpa"
xmlns:vm="clr-namespace:Ifpa.ViewModels">
xmlns:vm="clr-namespace:Ifpa.ViewModels"
x:DataType="vm:TournamentResultsViewModel">
<ContentPage.Resources>
<ResourceDictionary>
<Style x:Key="labelStyle"
Expand Down

0 comments on commit 68d53a5

Please sign in to comment.