Skip to content

Feature: Display multiple tags in the details layout #11216

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

Merged
merged 4 commits into from
Feb 8, 2023
Merged

Feature: Display multiple tags in the details layout #11216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a216c7
Feature: Display multiple tags in the details layout
yaira2 Feb 8, 2023
08fa42c
Update DetailsLayoutBrowser.xaml
yaira2 Feb 8, 2023
1235be6
Optimize
yaira2 Feb 8, 2023
d27a1ab
Update DetailsLayoutBrowser.xaml
yaira2 Feb 8, 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
8 changes: 8 additions & 0 deletions src/Files.App/Filesystem/ListedItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ public string[] FileTags
{
var dbInstance = FileTagsHelper.GetDbInstance();
dbInstance.SetTags(ItemPath, FileFRN, value);
HasTags = !FileTags.IsEmpty();
FileTagsHelper.WriteFileTag(ItemPath, value);
OnPropertyChanged(nameof(FileTagsUI));
}
Expand All @@ -157,6 +158,13 @@ public double Opacity
set => SetProperty(ref opacity, value);
}

private bool hasTags;
public bool HasTags
{
get => hasTags;
set => SetProperty(ref hasTags, value);
}

private CloudDriveSyncStatusUI syncStatusUI = new();
public CloudDriveSyncStatusUI SyncStatusUI
{
Expand Down
64 changes: 38 additions & 26 deletions src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
xmlns:converters1="using:Files.App.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:filetags="using:Files.Backend.ViewModels.FileTags"
xmlns:helpers="using:Files.App.Helpers"
xmlns:i="using:Microsoft.Xaml.Interactivity"
xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
Expand All @@ -17,6 +18,7 @@
xmlns:tui="using:CommunityToolkit.WinUI.UI"
xmlns:uc="using:Files.App.UserControls"
xmlns:vc="using:Files.App.ValueConverters"
xmlns:winui="using:ABI.Microsoft.UI.Xaml.Controls"
x:Name="PageRoot"
NavigationCacheMode="Enabled"
mc:Ignorable="d">
Expand Down Expand Up @@ -676,32 +678,42 @@
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Visibility="{Binding ColumnsViewModel.TagColumn.Visibility, ElementName=PageRoot, Mode=OneWay}">
<StackPanel
Height="24"
Padding="8,0"
HorizontalAlignment="Left"
x:Phase="2"
BorderBrush="{x:Bind FileTagsUI[0].Color, Mode=OneWay, Converter={StaticResource StringToBrushConverter}}"
BorderThickness="1"
CornerRadius="12"
Orientation="Horizontal"
Spacing="8"
ToolTipService.ToolTip="{x:Bind FileTagsUI[0].Name, Mode=OneWay}"
Visibility="{x:Bind FileTagsUI, Converter={StaticResource EmptyObjectToObjectConverter}, Mode=OneWay}">
<FontIcon
FontSize="12"
Foreground="{x:Bind FileTagsUI[0].Color, Mode=OneWay, Converter={StaticResource StringToBrushConverter}}"
Glyph="&#xE1CB;" />
<TextBlock
x:Name="ItemTag"
VerticalAlignment="Center"
FontSize="12"
LineHeight="18"
Style="{StaticResource ColumnContentTextBlock}"
Text="{x:Bind FileTagsUI[0].Name, Mode=OneWay}"
TextTrimming="CharacterEllipsis"
Visibility="{x:Bind FileTagsUI, Converter={StaticResource EmptyObjectToObjectConverter}, Mode=OneWay}" />
</StackPanel>
<ItemsRepeater
x:Name="TagsRepeater"
x:Load="{x:Bind HasTags, Mode=OneWay}"
ItemsSource="{x:Bind FileTagsUI, Mode=OneWay}">
<ItemsRepeater.Layout>
<StackLayout Orientation="Horizontal" Spacing="4" />
</ItemsRepeater.Layout>
<ItemsRepeater.ItemTemplate>
<DataTemplate x:DataType="filetags:TagViewModel">
<StackPanel
Height="24"
Padding="8,0"
HorizontalAlignment="Left"
x:Phase="2"
BorderBrush="{x:Bind Color, Mode=OneWay, Converter={StaticResource StringToBrushConverter}}"
BorderThickness="1"
CornerRadius="12"
Orientation="Horizontal"
Spacing="8"
ToolTipService.ToolTip="{x:Bind Name, Mode=OneWay}">
<FontIcon
FontSize="12"
Foreground="{x:Bind Color, Mode=OneWay, Converter={StaticResource StringToBrushConverter}}"
Glyph="&#xE1CB;" />
<TextBlock
x:Name="ItemTag"
VerticalAlignment="Center"
FontSize="12"
LineHeight="18"
Style="{StaticResource ColumnContentTextBlock}"
Text="{x:Bind Name, Mode=OneWay}"
TextTrimming="CharacterEllipsis" />
</StackPanel>
</DataTemplate>
</ItemsRepeater.ItemTemplate>
</ItemsRepeater>
</Grid>

<TextBlock
Expand Down