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

chore(ProgressRing/Bar): add Fluent tab to sample page #933

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore(ProgressRing/Bar): add Fluent tab to sample page #933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 20 additions & 16 deletions Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ProgressSamplePage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@

<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<local:SamplePageLayout>

<d:SamplePageLayout.FluentTemplate>
<local:SamplePageLayout.FluentTemplate>
<DataTemplate>
<StackPanel>

<!-- ProgressRing -->
<!-- skia: ProgressRing uses Lottie which isnt supported on skia yet -->
<StackPanel>
<smtx:XamlDisplay UniqueKey="ProgressSamplePage_Fluent" smtx:XamlDisplayExtensions.Header="ProgressRing">
<smtx:XamlDisplay UniqueKey="ProgressSamplePage_Fluent"
smtx:XamlDisplayExtensions.Header="ProgressRing">

<muxc:ProgressRing IsActive="True" HorizontalAlignment="Left" />
<muxc:ProgressRing IsActive="True"
HorizontalAlignment="Left" />

</smtx:XamlDisplay>
<smtx:XamlDisplay UniqueKey="ProgressSamplePage_Fluent_ProgressRingDeterminate"
Expand All @@ -37,7 +37,6 @@
Minimum="0"
Maximum="100"
IsIndeterminate="False" />

</StackPanel>
</smtx:XamlDisplay>
</StackPanel>
Expand Down Expand Up @@ -66,18 +65,19 @@
smtx:XamlDisplayExtensions.IgnorePath="XamlDisplay">
<muxc:ProgressBar IsIndeterminate="True" />
</smtx:XamlDisplay>

</StackPanel>
</DataTemplate>
</d:SamplePageLayout.FluentTemplate>
</local:SamplePageLayout.FluentTemplate>

<local:SamplePageLayout.MaterialTemplate>
<DataTemplate>
<StackPanel>

<!-- ProgressRing -->
<!-- skia: ProgressRing uses Lottie which isnt supported on skia yet -->
<StackPanel>
<smtx:XamlDisplay UniqueKey="ProgressSamplePage_Material_ProgressRingIndeterminate" smtx:XamlDisplayExtensions.Header="ProgressRing">
<smtx:XamlDisplay UniqueKey="ProgressSamplePage_Material_ProgressRingIndeterminate"
smtx:XamlDisplayExtensions.Header="ProgressRing">

<muxc:ProgressRing IsActive="True"
Style="{StaticResource MaterialProgressRingStyle}"
Expand Down Expand Up @@ -129,21 +129,24 @@
smtx:XamlDisplayExtensions.Header="Indeterminate ProgressBar"
smtx:XamlDisplayExtensions.IgnorePath="XamlDisplay">

<muxc:ProgressBar IsIndeterminate="True" Style="{StaticResource MaterialProgressBarStyle}" />
<muxc:ProgressBar IsIndeterminate="True"
Style="{StaticResource MaterialProgressBarStyle}" />

</smtx:XamlDisplay>

</StackPanel>
</DataTemplate>
</local:SamplePageLayout.MaterialTemplate>

<d:SamplePageLayout.CupertinoTemplate>
<DataTemplate>
<StackPanel>

<!-- ProgressRing -->
<!-- skia: ProgressRing uses Lottie which isnt supported on skia yet -->
<StackPanel>
<smtx:XamlDisplay UniqueKey="ProgressSamplePage_Cupertino_ProgressRingIndeterminate" smtx:XamlDisplayExtensions.Header="ProgressRing">
<smtx:XamlDisplay UniqueKey="ProgressSamplePage_Cupertino_ProgressRingIndeterminate"
smtx:XamlDisplayExtensions.Header="ProgressRing">

<muxc:ProgressRing IsActive="True"
Style="{StaticResource CupertinoProgressRingStyle}"
Expand Down Expand Up @@ -192,16 +195,17 @@

</StackPanel>
</smtx:XamlDisplay>
<smtx:XamlDisplay UniqueKey="Cupertino_ProgressBarSamplePage_PrimaryIndeterminate" smtx:XamlDisplayExtensions.Header="Indeterminate ProgressBar">
<smtx:XamlDisplay UniqueKey="Cupertino_ProgressBarSamplePage_PrimaryIndeterminate"
smtx:XamlDisplayExtensions.Header="Indeterminate ProgressBar">

<muxc:ProgressBar IsIndeterminate="True" Style="{StaticResource CupertinoProgressBarStyle}" />
<muxc:ProgressBar IsIndeterminate="True"
Style="{StaticResource CupertinoProgressBarStyle}" />

</smtx:XamlDisplay>

</StackPanel>
</DataTemplate>
</d:SamplePageLayout.CupertinoTemplate>

</local:SamplePageLayout>
</Grid>
</Page>