Skip to content

Commit 79b809e

Browse files
niels9001niels9001
committed
Hiding samples box when having only 1 sample
1 parent 95a428f commit 79b809e

File tree

5 files changed

+78
-66
lines changed

5 files changed

+78
-66
lines changed

‎CommunityToolkit.App.Shared/Renderers/ToolkitDocumentationRenderer.xaml

Lines changed: 72 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
1313
xmlns:renderer="using:CommunityToolkit.App.Shared.Renderers"
1414
xmlns:wasm="http://uno.ui/wasm"
15-
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
15+
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:converters="using:CommunityToolkit.WinUI.Converters"
1616
mc:Ignorable="d wasm">
1717

1818
<Page.Resources>
@@ -34,6 +34,7 @@
3434
<local:DocOrSampleTemplateSelector x:Key="DocOrSampleTemplateSelector"
3535
Document="{StaticResource DocumentTemplate}"
3636
Sample="{StaticResource SampleTemplate}" />
37+
<converters:DoubleToVisibilityConverter x:Name="doubleToVisibilityConverter" GreaterThan="1" TrueValue="Visible" FalseValue="Collapsed" NullValue="Collapsed"/>
3738
</Page.Resources>
3839

3940
<Grid>
@@ -90,7 +91,12 @@
9091
<!-- Header grid -->
9192
<Grid x:Name="HeaderGrid"
9293
Margin="40,24,40,40"
93-
VerticalAlignment="Top">
94+
VerticalAlignment="Top"
95+
ColumnSpacing="8">
96+
<Grid.ColumnDefinitions>
97+
<ColumnDefinition Width="*" />
98+
<ColumnDefinition Width="Auto" />
99+
</Grid.ColumnDefinitions>
94100
<Grid.RowDefinitions>
95101
<RowDefinition Height="Auto" />
96102
<RowDefinition Height="Auto" />
@@ -109,75 +115,75 @@
109115
Text="{x:Bind Metadata.Description, Mode=OneWay}"
110116
TextWrapping="WrapWholeWords" />
111117

112-
<Grid Grid.Row="2"
113-
Margin="0,16,0,0"
114-
ColumnSpacing="8">
115-
116-
<StackPanel x:Name="ButtonPanel"
117-
x:Load="{x:Bind renderer:ToolkitDocumentationRenderer.IsProjectPathValid()}"
118-
Orientation="Horizontal"
119-
Spacing="8">
120-
<Button Visibility="{x:Bind renderer:ToolkitDocumentationRenderer.IsIdValid(Metadata.DiscussionId), Mode=OneWay}">
121-
<StackPanel Orientation="Horizontal">
122-
<FontIcon FontSize="14"
123-
Glyph="&#xE8F2;" />
124-
<TextBlock Margin="8,0,0,0"
125-
Text="Discussion" />
126-
</StackPanel>
127-
<interactivity:Interaction.Behaviors>
128-
<interactions:EventTriggerBehavior EventName="Click">
129-
<behaviors:NavigateToUriAction NavigateUri="{x:Bind renderer:ToolkitDocumentationRenderer.ToGitHubUri('discussions', Metadata.DiscussionId), Mode=OneWay}" />
130-
</interactions:EventTriggerBehavior>
131-
</interactivity:Interaction.Behaviors>
132-
</Button>
133-
<Button Visibility="{x:Bind renderer:ToolkitDocumentationRenderer.IsIdValid(Metadata.IssueId), Mode=OneWay}">
134-
<StackPanel Orientation="Horizontal">
135-
<PathIcon Margin="-3"
136-
VerticalAlignment="Center"
137-
Data="{StaticResource GithubIcon}">
138-
<PathIcon.RenderTransform>
139-
<CompositeTransform ScaleX="0.65"
140-
ScaleY="0.65"
141-
TranslateX="-5"
142-
TranslateY="5" />
143-
</PathIcon.RenderTransform>
144-
</PathIcon>
145-
<TextBlock Margin="-4,0,0,0"
146-
Text="Tracking Issue" />
147-
</StackPanel>
148-
<interactivity:Interaction.Behaviors>
149-
<interactions:EventTriggerBehavior EventName="Click">
150-
<behaviors:NavigateToUriAction NavigateUri="{x:Bind renderer:ToolkitDocumentationRenderer.ToGitHubUri('issues', Metadata.IssueId), Mode=OneWay}" />
151-
</interactions:EventTriggerBehavior>
152-
</interactivity:Interaction.Behaviors>
153-
</Button>
154-
</StackPanel>
155-
156-
<StackPanel HorizontalAlignment="Right"
157-
VerticalAlignment="Center"
158-
Orientation="Horizontal"
159-
Spacing="8">
160-
<TextBlock VerticalAlignment="Center"
118+
<StackPanel x:Name="ButtonPanel"
119+
Grid.Row="2"
120+
Margin="0,16,0,0"
121+
x:Load="{x:Bind renderer:ToolkitDocumentationRenderer.IsProjectPathValid()}"
122+
Orientation="Horizontal"
123+
Spacing="8">
124+
<Button Visibility="{x:Bind renderer:ToolkitDocumentationRenderer.IsIdValid(Metadata.DiscussionId), Mode=OneWay}">
125+
<StackPanel Orientation="Horizontal">
126+
<FontIcon FontSize="14"
127+
Glyph="&#xE8F2;" />
128+
<TextBlock Margin="8,0,0,0"
129+
Text="Discussion" />
130+
</StackPanel>
131+
<interactivity:Interaction.Behaviors>
132+
<interactions:EventTriggerBehavior EventName="Click">
133+
<behaviors:NavigateToUriAction NavigateUri="{x:Bind renderer:ToolkitDocumentationRenderer.ToGitHubUri('discussions', Metadata.DiscussionId), Mode=OneWay}" />
134+
</interactions:EventTriggerBehavior>
135+
</interactivity:Interaction.Behaviors>
136+
</Button>
137+
<Button Visibility="{x:Bind renderer:ToolkitDocumentationRenderer.IsIdValid(Metadata.IssueId), Mode=OneWay}">
138+
<StackPanel Orientation="Horizontal">
139+
<PathIcon Margin="-3"
140+
VerticalAlignment="Center"
141+
Data="{StaticResource GithubIcon}">
142+
<PathIcon.RenderTransform>
143+
<CompositeTransform ScaleX="0.65"
144+
ScaleY="0.65"
145+
TranslateX="-5"
146+
TranslateY="5" />
147+
</PathIcon.RenderTransform>
148+
</PathIcon>
149+
<TextBlock Margin="-4,0,0,0"
150+
Text="Tracking Issue" />
151+
</StackPanel>
152+
<interactivity:Interaction.Behaviors>
153+
<interactions:EventTriggerBehavior EventName="Click">
154+
<behaviors:NavigateToUriAction NavigateUri="{x:Bind renderer:ToolkitDocumentationRenderer.ToGitHubUri('issues', Metadata.IssueId), Mode=OneWay}" />
155+
</interactions:EventTriggerBehavior>
156+
</interactivity:Interaction.Behaviors>
157+
</Button>
158+
</StackPanel>
159+
<ComboBox x:Name="SampleSelectionBox"
160+
Grid.RowSpan="2"
161+
Grid.Column="1"
162+
MinWidth="160"
163+
HorizontalAlignment="Right"
164+
VerticalAlignment="Bottom"
165+
Visibility="{x:Bind Samples.Count, Converter={StaticResource doubleToVisibilityConverter}}"
166+
ItemsSource="{x:Bind Samples, Mode=OneWay}"
167+
SelectedIndex="0"
168+
SelectionChanged="SampleSelectionBox_SelectionChanged">
169+
<ComboBox.Header>
170+
<TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}"
161171
Style="{StaticResource CaptionTextBlockStyle}"
162-
Text="Sample:" />
163-
<ComboBox x:Name="SampleSelectionBox"
164-
MinWidth="160"
165-
ItemsSource="{x:Bind Samples, Mode=OneWay}"
166-
SelectedIndex="0"
167-
SelectionChanged="SampleSelectionBox_SelectionChanged">
168-
<ComboBox.ItemTemplate>
169-
<DataTemplate x:DataType="metadata:ToolkitSampleMetadata">
170-
<TextBlock Text="{Binding DisplayName, Mode=OneWay}" />
171-
</DataTemplate>
172-
</ComboBox.ItemTemplate>
173-
</ComboBox>
174-
</StackPanel>
175-
</Grid>
172+
Text="Go to sample:" />
173+
</ComboBox.Header>
174+
<ComboBox.ItemTemplate>
175+
<DataTemplate x:DataType="metadata:ToolkitSampleMetadata">
176+
<TextBlock Text="{Binding DisplayName, Mode=OneWay}" />
177+
</DataTemplate>
178+
</ComboBox.ItemTemplate>
179+
</ComboBox>
180+
176181
<muxc:InfoBar Title="Experimental"
177182
Grid.Row="3"
183+
Grid.ColumnSpan="2"
178184
Margin="0,16,0,0"
179185
IsClosable="False"
180-
IsOpen="True">
186+
IsOpen="False">
181187
<muxc:InfoBar.ActionButton>
182188
<HyperlinkButton Content="Learn how you can use this experiment in your app"
183189
NavigateUri="https://aka.ms/wct/wiki/previewpackages" />

‎ProjectHeads/App.Head.Uno.UI.Dependencies.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@
44
<ItemGroup>
55
<!--<PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Markdown" Version="7.1.11" />-->
66
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.3.1-uno.2" />
7+
<PackageReference Include="CommunityToolkit.Uwp.Converters" Version="8.0.0-beta.1" />
78
</ItemGroup>
89
</Project>
10+
11+

‎ProjectHeads/App.Head.Uno.WinUI.Dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
<ItemGroup>
55
<!--<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.100-dev.15.g12261e2626" />-->
66
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.1-uno.2" />
7+
<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.0.0-beta.1" />
78
</ItemGroup>
89
</Project>

‎ProjectHeads/App.Head.Uwp.Dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Markdown" Version="7.1.2" />
66
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1" />
77
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
8+
<PackageReference Include="CommunityToolkit.Uwp.Converters" Version="8.0.0-beta.1" />
89
</ItemGroup>
910
</Project>

‎ProjectHeads/App.Head.WinAppSdk.Dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
<ItemGroup>
55
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
66
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
7+
<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.0.0-beta.1" />
78
</ItemGroup>
89
</Project>

0 commit comments

Comments
 (0)