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

Jump to bottom

Feature: Updated the design of the home page headers #13053

Merged
merged 20 commits into from
Aug 10, 2023
Merged

Feature: Updated the design of the home page headers #13053

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ba62df8
Initial commit
0x5bfa Jul 23, 2023
ba4dec3
Tweaked UI
0x5bfa Jul 23, 2023
c285519
Improve UI
0x5bfa Jul 24, 2023
da9dcef
Update margins
0x5bfa Jul 24, 2023
f3b4269
Update
0x5bfa Jul 25, 2023
71ced6a
Merge branch 'main' into 5bfa/Refresh-HomeUI
0x5bfa Jul 27, 2023
345d9c7
Reverted changes
0x5bfa Jul 27, 2023
993eb4f
Fixed
0x5bfa Jul 28, 2023
210d6fc
Merge branch 'main' into 5bfa/Refresh-HomeUI
0x5bfa Jul 28, 2023
ed8739a
Merge branch 'main' into 5bfa/Refresh-HomeUI
yaira2 Aug 8, 2023
3145ba7
Merge branch 'main' into 5bfa/Refresh-HomeUI
yaira2 Aug 9, 2023
2e5cd2a
Update AddressToolbar.xaml
yaira2 Aug 9, 2023
cfc025d
Margins
yaira2 Aug 9, 2023
eb9928a
Update WidgetsListControl.xaml
yaira2 Aug 9, 2023
d260fb3
Update WidgetsListControl.xaml
yaira2 Aug 9, 2023
d49bf84
Update WidgetsListControl.xaml
yaira2 Aug 9, 2023
3adeaf0
Update WidgetsListControl.xaml
yaira2 Aug 9, 2023
61a64fe
Update WidgetsListControl.xaml
yaira2 Aug 9, 2023
ad96dde
Update WidgetsListControl.xaml
yaira2 Aug 10, 2023
3e8317b
Update WidgetsListControl.xaml
yaira2 Aug 10, 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
46 changes: 0 additions & 46 deletions src/Files.App/UserControls/AddressToolbar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,52 +416,6 @@
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
<VisualStateGroup>
yaira2 marked this conversation as resolved.
Show resolved Hide resolved
<VisualState x:Name="TasksSuccess">
<VisualState.StateTriggers>
<triggers:CompareStateTrigger
Comparison="Equal"
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
To="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource SuccessIconInfoBadgeStyle}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="TasksOnging">
<VisualState.StateTriggers>
<triggers:CompareStateTrigger
Comparison="Equal"
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
To="1" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource AttentionValueInfoBadgeStyle}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="TasksFailure">
<VisualState.StateTriggers>
<triggers:CompareStateTrigger
Comparison="Equal"
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
To="2" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource CriticalValueInfoBadgeStyle}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="TasksCompletionWithFailure">
<VisualState.StateTriggers>
<triggers:CompareStateTrigger
Comparison="Equal"
Value="{x:Bind OngoingTasksViewModel.InfoBadgeState, Mode=OneWay}"
To="3" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="StatusInfoBadge.Style" Value="{StaticResource CriticalIconInfoBadgeStyle}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>

Expand Down
6 changes: 4 additions & 2 deletions src/Files.App/UserControls/Widgets/DrivesWidget.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Copyright (c) 2023 Files Community. Licensed under the MIT License. See the LICENSE. -->
<!-- Copyright (c) 2023 Files Community. Licensed under the MIT License. See the LICENSE. -->
<local:HomePageWidget
x:Class="Files.App.UserControls.Widgets.DrivesWidget"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand All @@ -9,7 +9,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">

<Grid>
<Grid Padding="16,0,16,0">
yaira2 marked this conversation as resolved.
Show resolved Hide resolved
<ItemsRepeater
x:Name="CardsList"
HorizontalAlignment="Stretch"
Expand Down Expand Up @@ -57,6 +57,7 @@
<RowDefinition Height="*" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>

<Image
Grid.RowSpan="3"
Grid.Column="0"
Expand Down Expand Up @@ -126,6 +127,7 @@
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"
ToolTipService.ToolTip="{x:Bind Item.SpaceText, Mode=OneWay}" />

</Grid>
</Button>
</DataTemplate>
Expand Down
1 change: 0 additions & 1 deletion src/Files.App/UserControls/Widgets/FileTagsWidget.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:helpers="using:Files.App.Helpers"
xmlns:local="using:Files.App.UserControls.Widgets"
xmlns:localcontrols="using:Files.App.UserControls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:Files.App.ViewModels.Widgets"
d:DesignHeight="300"
Expand Down
3 changes: 1 addition & 2 deletions src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:helpers="using:Files.App.Helpers"
xmlns:local="using:Files.App.UserControls.Widgets"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">

<Grid>
<Grid Padding="16,0,16,0">
<ItemsRepeater
x:Name="CardsList"
Grid.Row="0"
Expand Down
27 changes: 16 additions & 11 deletions src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Copyright (c) 2023 Files Community. Licensed under the MIT License. See the LICENSE. -->
<!-- Copyright (c) 2023 Files Community. Licensed under the MIT License. See the LICENSE. -->
<local:HomePageWidget
x:Class="Files.App.UserControls.Widgets.RecentFilesWidget"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
Expand All @@ -12,11 +12,12 @@
Background="{ThemeResource SolidBackgroundFillColorBaseBrush}"
mc:Ignorable="d">

<StackPanel x:Name="RecentsListGrid" Orientation="Vertical">
<StackPanel x:Name="RecentsListGrid" Padding="12,0,12,0">

<!-- Message when recent files are disabled in File Explorer -->
<muxc:InfoBar
x:Name="RecentFilesDisabledOnWindowsWarning"
Margin="4,0,4,0"
x:Load="{x:Bind IsRecentFilesDisabledInWindows, Mode=OneWay}"
IsClosable="False"
IsIconVisible="True"
Expand All @@ -27,6 +28,7 @@
<!-- Message when there are no recent files to display -->
<TextBlock
x:Name="RecentItemDescription"
Margin="4,0,4,0"
HorizontalAlignment="Stretch"
x:Load="{x:Bind IsEmptyRecentsTextVisible, Mode=OneWay}"
FontSize="14"
Expand All @@ -49,6 +51,8 @@

<ListView.ItemContainerStyle>
<Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
<Setter Property="Margin" Value="0" />
<Setter Property="Padding" Value="12,0" />
<Setter Property="MinHeight" Value="1" />
<Setter Property="Height" Value="{ThemeResource ListItemHeight}" />
</Style>
Expand All @@ -57,41 +61,41 @@
<ListView.ItemTemplate>
<DataTemplate x:DataType="recent:RecentItem">
<Grid
Padding="2.5"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
AutomationProperties.Name="{x:Bind Name}"
ColumnSpacing="14"
ColumnSpacing="20"
ToolTipService.ToolTip="{x:Bind RecentPath}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="1.5*" />
</Grid.ColumnDefinitions>

<FontIcon
x:Name="RecentFolderImg"
Grid.Column="0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
x:Load="{x:Bind FolderImg}"
x:Phase="1"
FontSize="24"
FontSize="20"
Foreground="#ffe793"
Glyph="&#xE8B7;" />

<FontIcon
x:Name="EmptyImg"
Grid.Column="0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
x:Load="{x:Bind EmptyImgVis}"
x:Phase="1"
FontSize="24"
FontSize="20"
Glyph="&#xE7C3;" />

<Image
x:Name="RecentFileImg"
Grid.Column="0"
Width="24"
Height="24"
Width="20"
Height="20"
HorizontalAlignment="Center"
VerticalAlignment="Center"
x:Load="{x:Bind FileIconVis}"
Expand All @@ -113,6 +117,7 @@
Text="{x:Bind RecentPath}"
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap" />

</Grid>
</DataTemplate>
</ListView.ItemTemplate>
Expand Down
Loading