Skip to content

Feature: Xaml cleanup #11196

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 2 commits into from
Feb 7, 2023
Merged

Feature: Xaml cleanup #11196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3beb156
Feature: Cleaned up extra xaml
yaira2 Feb 7, 2023
bacb0ae
Ongoing tasks
yaira2 Feb 7, 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
7 changes: 2 additions & 5 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 @@ -1893,11 +1893,8 @@
<data name="canceling" xml:space="preserve">
<value>canceling</value>
</data>
<data name="OngoingTasksDismissBannerButton.AutomationProperties.Name" xml:space="preserve">
<value>Dismiss</value>
</data>
<data name="OngoingTasksDismissBannerButton.ToolTipService.ToolTip" xml:space="preserve">
<value>Dismiss</value>
<data name="Clear" xml:space="preserve">
<value>Clear</value>
</data>
<data name="Widgets" xml:space="preserve">
<value>Widgets</value>
Expand Down
84 changes: 40 additions & 44 deletions src/Files.App/UserControls/AddressToolbar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,50 +215,46 @@
</Button.KeyboardAccelerators>
</Button>

<Grid Visibility="{x:Bind OngoingTasksViewModel.AnyBannersPresent, Mode=OneWay}">
<Button
x:Name="OngoingTasks"
Padding="0"
AccessKey="T"
AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}"
Style="{StaticResource AddressToolbarButtonStyle}"
ToolTipService.ToolTip="{helpers:ResourceString Name=OngoingTasks}">
<Button.Content>
<Grid>
<FontIcon
x:Name="OngoingTasksFontIcon"
FontSize="16"
Glyph="&#xF16A;" />
<ProgressRing
x:Name="MedianOperationProgressRing"
Width="28"
Height="28"
HorizontalAlignment="Center"
VerticalAlignment="Center"
x:Load="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Mode=OneWay}"
IsIndeterminate="False"
Value="{x:Bind OngoingTasksViewModel.MedianOperationProgressValue, Mode=OneWay}" />
</Grid>
</Button.Content>
<Button.Flyout>
<Flyout contract8Present:ShouldConstrainToRootBounds="False" AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}">
<uc:OngoingTasksFlyout
x:Name="OngoingTasksControl"
Width="300"
MinHeight="300"
MaxHeight="400"
x:FieldModifier="public"
IsTabStop="True"
OngoingTasksViewModel="{x:Bind OngoingTasksViewModel}" />
</Flyout>
</Button.Flyout>
</Button>
<InfoBadge
x:Name="StatusInfoBadge"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
</Grid>
<Button
x:Name="OngoingTasks"
Padding="0"
AccessKey="T"
AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}"
Style="{StaticResource AddressToolbarButtonStyle}"
ToolTipService.ToolTip="{helpers:ResourceString Name=OngoingTasks}"
Visibility="{x:Bind OngoingTasksViewModel.AnyBannersPresent, Mode=OneWay}">
<Button.Content>
<Grid>
<FontIcon
x:Name="OngoingTasksFontIcon"
x:Load="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
FontSize="16"
Glyph="&#xF16A;" />

<ProgressRing
x:Name="MedianOperationProgressRing"
Width="20"
Height="20"
HorizontalAlignment="Center"
VerticalAlignment="Center"
x:Load="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Mode=OneWay}"
IsIndeterminate="False"
Value="{x:Bind OngoingTasksViewModel.MedianOperationProgressValue, Mode=OneWay}" />
</Grid>
</Button.Content>
<Button.Flyout>
<Flyout contract8Present:ShouldConstrainToRootBounds="False" AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}">
<uc:OngoingTasksFlyout
x:Name="OngoingTasksControl"
Width="400"
MinHeight="300"
MaxHeight="500"
x:FieldModifier="public"
IsTabStop="True"
OngoingTasksViewModel="{x:Bind OngoingTasksViewModel}" />
</Flyout>
</Button.Flyout>
</Button>

<!-- Install Update Notification -->
<Button
Expand Down
Loading