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

Jump to bottom

♻️ Mobile | Move to CollectionView on EarnPage and RedeemPage #920

Merged
merged 2 commits into from
May 24, 2024
Merged

♻️ Mobile | Move to CollectionView on EarnPage and RedeemPage #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffa2616
Move to CollectionView on EarnPage and RedeemPage
zacharykeeping May 17, 2024
22a4d2c
Cleanup
zacharykeeping May 21, 2024
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
4 changes: 3 additions & 1 deletion src/MobileUI/Controls/ListItem.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,16 @@
<Grid
Grid.Column="1"
ColumnDefinitions="*,Auto"
RowDefinitions="*,*"
RowDefinitions="Auto,*"
VerticalOptions="Center"
RowSpacing="2">
<Label Grid.Row="0"
Grid.Column="0"
Text="{Binding Title, Source={x:Reference this}}"
TextColor="White"
InputTransparent="True"
MaxLines="2"
LineBreakMode="WordWrap"
VerticalTextAlignment="End"
FontSize="16"
Style="{StaticResource LabelBold}">
Expand Down
41 changes: 23 additions & 18 deletions src/MobileUI/Pages/EarnPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,28 +52,33 @@
Margin="0,0,0,25"
x:Name="QuizIndicator" />
</Grid>

<VerticalStackLayout
<CollectionView
Grid.Row="1"
x:Name="QuizListSection"
BindableLayout.ItemsSource="{Binding Quizzes}"
Spacing="6">
<BindableLayout.ItemTemplate>
ItemsSource="{Binding Quizzes}"
ItemsUpdatingScrollMode="KeepItemsInView"
ItemSizingStrategy="{OnPlatform iOS='MeasureFirstItem', Android='MeasureAllItems'}">
<CollectionView.ItemsLayout>
<GridItemsLayout Orientation="Vertical" />
</CollectionView.ItemsLayout>
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="viewModels:QuizItemViewModel">
<controls:ListItem Title="{Binding Title}"
Description="{Binding Description}"
Points="{Binding Points}"
ButtonText="GO"
ButtonCommand="{Binding Source={x:Reference QuizList}, Path=BindingContext.OpenQuizCommand}"
ItemId="{Binding Id}"
ThumbnailImage="{Binding ThumbnailImage}"
PlaceholderGlyph="&#xf11b;"
ShowTick="{Binding Passed}"
IsDisabled="{Binding Passed}"
IsButtonDisabled="{Binding Passed}"/>
<Grid Padding="0,0,0,6">
<controls:ListItem Title="{Binding Title}"
Description="{Binding Description}"
Points="{Binding Points}"
ButtonText="GO"
ButtonCommand="{Binding Source={x:Reference QuizList}, Path=BindingContext.OpenQuizCommand}"
ItemId="{Binding Id}"
ThumbnailImage="{Binding ThumbnailImage}"
PlaceholderGlyph="&#xf11b;"
ShowTick="{Binding Passed}"
IsDisabled="{Binding Passed}"
IsButtonDisabled="{Binding Passed}"/>
</Grid>
</DataTemplate>
</BindableLayout.ItemTemplate>
</VerticalStackLayout>
</CollectionView.ItemTemplate>
</CollectionView>
</Grid>
<ActivityIndicator
HorizontalOptions="Center"
Expand Down
57 changes: 31 additions & 26 deletions src/MobileUI/Pages/RedeemPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,34 +109,39 @@
Margin="0,0,0,25"
x:Name="QuizIndicator" />
</Grid>

<VerticalStackLayout
x:Name="QuizListSection"
BindableLayout.ItemsSource="{Binding Rewards}"
Spacing="6">
<BindableLayout.ItemTemplate>

<CollectionView
ItemsSource="{Binding Rewards}"
ItemsUpdatingScrollMode="KeepItemsInView"
ItemSizingStrategy="{OnPlatform iOS='MeasureFirstItem', Android='MeasureAllItems'}">
<CollectionView.ItemsLayout>
<GridItemsLayout Orientation="Vertical" />
</CollectionView.ItemsLayout>
<CollectionView.ItemTemplate>
<DataTemplate x:DataType="models:Reward">
<controls:ListItem Title="{Binding Name}"
Description="{Binding Description}"
IsButtonDisabled="{Binding CanAfford, Converter={StaticResource InverseBool}}"
ItemId="{Binding Id}"
Points="{Binding Cost}"
ButtonText="GET"
ThumbnailImage="{Binding ImageUri}"
PlaceholderGlyph="&#xf06b;"
ButtonCommand="{Binding Source={x:Reference RewardList}, Path=BindingContext.RedeemRewardCommand}">
<controls:ListItem.Triggers>
<DataTrigger TargetType="controls:ListItem"
Binding="{Binding IsPendingRedemption}"
Value="True">
<Setter Property="ButtonText"
Value="QR" />
</DataTrigger>
</controls:ListItem.Triggers>
</controls:ListItem>
<Grid Padding="0,0,0,6">
<controls:ListItem Title="{Binding Name}"
Description="{Binding Description}"
IsButtonDisabled="{Binding CanAfford, Converter={StaticResource InverseBool}}"
ItemId="{Binding Id}"
Points="{Binding Cost}"
ButtonText="GET"
ThumbnailImage="{Binding ImageUri}"
PlaceholderGlyph="&#xf06b;"
ButtonCommand="{Binding Source={x:Reference RewardList}, Path=BindingContext.RedeemRewardCommand}">
<controls:ListItem.Triggers>
<DataTrigger TargetType="controls:ListItem"
Binding="{Binding IsPendingRedemption}"
Value="True">
<Setter Property="ButtonText"
Value="QR" />
</DataTrigger>
</controls:ListItem.Triggers>
</controls:ListItem>
</Grid>
</DataTemplate>
</BindableLayout.ItemTemplate>
</VerticalStackLayout>
</CollectionView.ItemTemplate>
</CollectionView>
</VerticalStackLayout>
</ScrollView>
</Grid>
Expand Down
Loading