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

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

Merged
merged 5 commits into from
Apr 16, 2023
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2814286
Feature: Replace See More string in Tags Home widget
ferrariofilippo Apr 5, 2023
860df23
Merge branch 'main' into Remove_See_More
ferrariofilippo Apr 15, 2023
5846ea3
Update src/Files.App/UserControls/Widgets/FileTagsWidget.xaml
yaira2 Apr 16, 2023
d4ca2fb
Accessibility fix
ferrariofilippo Apr 16, 2023
8449c54
Merge branch 'main' into Remove_See_More
ferrariofilippo Apr 16, 2023
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
3 changes: 0 additions & 3 deletions src/Files.App/Strings/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2475,9 +2475,6 @@
<data name="DoubleClickBlankSpaceToGoUp" xml:space="preserve">
<value>Double click on a blank space to go up one directory</value>
</data>
<data name="ViewMore" xml:space="preserve">
<value>View more</value>
</data>
<data name="BundlesBeingRemovedMessage" xml:space="preserve">
<value>But don't worry, we built a fantastic replacement that's more reliable and has more features. You can enable the File Tags widget from Settings &gt; Preferences &gt; Widgets. Enabling the tags widget will automatically turn off the bundles widget.</value>
</data>
Expand Down
60 changes: 34 additions & 26 deletions src/Files.App/UserControls/Widgets/FileTagsWidget.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,43 @@
<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"
Command="{x:Bind ViewMoreCommand}">
<HyperlinkButton.Content>
<FontIcon
FontSize="12"
FontWeight="SemiBold"
Glyph="&#xE76C;" />
</HyperlinkButton.Content>
</HyperlinkButton>
</Grid>

<!-- Contents -->
<controls:AdaptiveGridView
Expand Down Expand Up @@ -110,14 +126,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