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.

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

Feature: Simplified the see more button on the tags widget #11988

Merged
merged 5 commits into from
Apr 16, 2023
Merged
Changes from all commits
Commits
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
62 changes: 36 additions & 26 deletions src/Files.App/UserControls/Widgets/FileTagsWidget.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,45 @@
<RowDefinition Height="Auto" />
<!-- Contents -->
<RowDefinition Height="*" />
<!-- View More -->
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<!-- Title -->
<StackPanel
Grid.Row="0"
Padding="12,8"
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
BorderThickness="0,0,0,1"
Orientation="Horizontal"
Spacing="8">
<Ellipse
Width="12"
Height="12"
Fill="{x:Bind Color, Mode=OneWay, Converter={StaticResource StringToBrushConverter}}" />
<TextBlock
Margin="0,-2,0,0"
FontWeight="SemiBold"
Text="{x:Bind Name, Mode=OneWay}" />
</StackPanel>
<Grid BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" BorderThickness="0,0,0,1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<StackPanel
Padding="12,8,12,8"
Orientation="Horizontal"
Spacing="8">
<Ellipse
Width="12"
Height="12"
Fill="{x:Bind Color, Mode=OneWay, Converter={StaticResource StringToBrushConverter}}" />
<TextBlock
Margin="0,-2,0,0"
FontWeight="SemiBold"
Text="{x:Bind Name, Mode=OneWay}" />
</StackPanel>

<!-- View More -->
<HyperlinkButton
ferrariofilippo marked this conversation as resolved.
Show resolved Hide resolved
Grid.Column="2"
Margin="4"
AutomationProperties.Name="{helpers:ResourceString Name=ViewMore}"
Command="{x:Bind ViewMoreCommand}"
ToolTipService.ToolTip="{helpers:ResourceString Name=ViewMore}">
<HyperlinkButton.Content>
<FontIcon
FontSize="12"
FontWeight="SemiBold"
Glyph="&#xE76C;" />
</HyperlinkButton.Content>
</HyperlinkButton>
</Grid>

<!-- Contents -->
<controls:AdaptiveGridView
Expand Down Expand Up @@ -110,14 +128,6 @@
</DataTemplate>
</controls:AdaptiveGridView.ItemTemplate>
</controls:AdaptiveGridView>

<!-- View More -->
<HyperlinkButton
Grid.Row="2"
Margin="8"
HorizontalAlignment="Center"
Command="{x:Bind ViewMoreCommand}"
Content="{helpers:ResourceString Name=ViewMore}" />
</Grid>
</DataTemplate>
</ItemsRepeater.ItemTemplate>
Expand Down