Skip to content

Commit 47e41dd

Browse files
authored
Feature: Xaml cleanup (#11196)
1 parent aebfe2b commit 47e41dd

File tree

11 files changed

+480
-669
lines changed

11 files changed

+480
-669
lines changed

src/Files.App/Strings/en-US/Resources.resw

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1893,11 +1893,8 @@
18931893
<data name="canceling" xml:space="preserve">
18941894
<value>canceling</value>
18951895
</data>
1896-
<data name="OngoingTasksDismissBannerButton.AutomationProperties.Name" xml:space="preserve">
1897-
<value>Dismiss</value>
1898-
</data>
1899-
<data name="OngoingTasksDismissBannerButton.ToolTipService.ToolTip" xml:space="preserve">
1900-
<value>Dismiss</value>
1896+
<data name="Clear" xml:space="preserve">
1897+
<value>Clear</value>
19011898
</data>
19021899
<data name="Widgets" xml:space="preserve">
19031900
<value>Widgets</value>

src/Files.App/UserControls/AddressToolbar.xaml

Lines changed: 40 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -215,50 +215,46 @@
215215
</Button.KeyboardAccelerators>
216216
</Button>
217217

218-
<Grid Visibility="{x:Bind OngoingTasksViewModel.AnyBannersPresent, Mode=OneWay}">
219-
<Button
220-
x:Name="OngoingTasks"
221-
Padding="0"
222-
AccessKey="T"
223-
AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}"
224-
Style="{StaticResource AddressToolbarButtonStyle}"
225-
ToolTipService.ToolTip="{helpers:ResourceString Name=OngoingTasks}">
226-
<Button.Content>
227-
<Grid>
228-
<FontIcon
229-
x:Name="OngoingTasksFontIcon"
230-
FontSize="16"
231-
Glyph="&#xF16A;" />
232-
<ProgressRing
233-
x:Name="MedianOperationProgressRing"
234-
Width="28"
235-
Height="28"
236-
HorizontalAlignment="Center"
237-
VerticalAlignment="Center"
238-
x:Load="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Mode=OneWay}"
239-
IsIndeterminate="False"
240-
Value="{x:Bind OngoingTasksViewModel.MedianOperationProgressValue, Mode=OneWay}" />
241-
</Grid>
242-
</Button.Content>
243-
<Button.Flyout>
244-
<Flyout contract8Present:ShouldConstrainToRootBounds="False" AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}">
245-
<uc:OngoingTasksFlyout
246-
x:Name="OngoingTasksControl"
247-
Width="300"
248-
MinHeight="300"
249-
MaxHeight="400"
250-
x:FieldModifier="public"
251-
IsTabStop="True"
252-
OngoingTasksViewModel="{x:Bind OngoingTasksViewModel}" />
253-
</Flyout>
254-
</Button.Flyout>
255-
</Button>
256-
<InfoBadge
257-
x:Name="StatusInfoBadge"
258-
HorizontalAlignment="Right"
259-
VerticalAlignment="Top"
260-
Value="{x:Bind OngoingTasksViewModel.InfoBadgeValue, Mode=OneWay}" />
261-
</Grid>
218+
<Button
219+
x:Name="OngoingTasks"
220+
Padding="0"
221+
AccessKey="T"
222+
AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}"
223+
Style="{StaticResource AddressToolbarButtonStyle}"
224+
ToolTipService.ToolTip="{helpers:ResourceString Name=OngoingTasks}"
225+
Visibility="{x:Bind OngoingTasksViewModel.AnyBannersPresent, Mode=OneWay}">
226+
<Button.Content>
227+
<Grid>
228+
<FontIcon
229+
x:Name="OngoingTasksFontIcon"
230+
x:Load="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
231+
FontSize="16"
232+
Glyph="&#xF16A;" />
233+
234+
<ProgressRing
235+
x:Name="MedianOperationProgressRing"
236+
Width="20"
237+
Height="20"
238+
HorizontalAlignment="Center"
239+
VerticalAlignment="Center"
240+
x:Load="{x:Bind OngoingTasksViewModel.AnyOperationsOngoing, Mode=OneWay}"
241+
IsIndeterminate="False"
242+
Value="{x:Bind OngoingTasksViewModel.MedianOperationProgressValue, Mode=OneWay}" />
243+
</Grid>
244+
</Button.Content>
245+
<Button.Flyout>
246+
<Flyout contract8Present:ShouldConstrainToRootBounds="False" AutomationProperties.Name="{helpers:ResourceString Name=OngoingTasks}">
247+
<uc:OngoingTasksFlyout
248+
x:Name="OngoingTasksControl"
249+
Width="400"
250+
MinHeight="300"
251+
MaxHeight="500"
252+
x:FieldModifier="public"
253+
IsTabStop="True"
254+
OngoingTasksViewModel="{x:Bind OngoingTasksViewModel}" />
255+
</Flyout>
256+
</Button.Flyout>
257+
</Button>
262258

263259
<!-- Install Update Notification -->
264260
<Button

0 commit comments

Comments
 (0)