Skip to content

Commit 5165b4c

Browse files
lukeblevinslukeblevins
committed
Switch Commands to CommandBar
1 parent fafcd41 commit 5165b4c

File tree

1 file changed

+65
-60
lines changed

1 file changed

+65
-60
lines changed

‎GenericFileBrowser.xaml

Lines changed: 65 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -291,79 +291,83 @@
291291
</VisualStateManager.VisualStateGroups>
292292

293293

294-
<Grid Tag="{x:Bind Tag, Mode=OneWay}" Background="{StaticResource ApplicationPageBackgroundThemeBrush}" Padding="50,0,50,0" VerticalAlignment="Stretch">
294+
<Grid Tag="{x:Bind Tag, Mode=OneWay}" Background="{StaticResource ApplicationPageBackgroundThemeBrush}" Padding="0,0,0,0" VerticalAlignment="Stretch">
295295
<Grid.RowDefinitions>
296-
<RowDefinition Height="20*"/>
296+
<RowDefinition Height="35"/>
297+
<RowDefinition Height="Auto"/>
297298
<RowDefinition Height="Auto"/>
298299
<RowDefinition Height="80*"/>
299300
</Grid.RowDefinitions>
300-
<TextBlock Name="EmptyText" Visibility="{x:Bind local2:ItemViewModel.TextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,55,0,0" Canvas.ZIndex="5" Grid.Row="2"/>
301-
<Grid DataContext="{Binding BackObject}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
302-
303-
<StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="-15,0,0,0">
304-
<StackPanel Orientation="Vertical" Margin="2">
305-
<AppBarButton LabelPosition="Collapsed" Style="{ThemeResource AppBarButtonFixedStyle}" HorizontalAlignment="Center" x:FieldModifier="public" IsEnabled="{x:Bind local2:ItemViewModel.BS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="Back" VerticalAlignment="Center" Height="50" Width="50">
301+
<TextBlock Name="EmptyText" Visibility="{x:Bind local2:ItemViewModel.TextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0" Grid.Row="3" Canvas.ZIndex="5"/>
302+
303+
304+
305+
<CommandBar Background="{StaticResource ApplicationPageBackgroundThemeBrush}" Margin="0,0,0,0" Grid.Row="1" DefaultLabelPosition="Right" OverflowButtonVisibility="Visible" IsSticky="True" VerticalAlignment="Stretch">
306+
<CommandBar.Content>
307+
<StackPanel Orientation="Horizontal">
308+
<AppBarButton LabelPosition="Collapsed" IsEnabled="{x:Bind local2:ItemViewModel.BS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="Back">
309+
<AppBarButton.Icon>
310+
<FontIcon Glyph="&#xE76B;" FontFamily="Segoe MDL2 Assets"/>
311+
</AppBarButton.Icon>
306312

307-
<AppBarButton.ContentTemplate>
308-
<DataTemplate>
309-
<TextBlock Text="&#xE76B;" FontFamily="Segoe MDL2 Assets" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" />
310-
</DataTemplate>
311-
</AppBarButton.ContentTemplate>
312-
</AppBarButton>
313-
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" HorizontalAlignment="Center" TextAlignment="Center" Text="Back" Width="60"/>
314-
</StackPanel>
315-
<StackPanel Orientation="Vertical" Margin="2">
316-
<Grid HorizontalAlignment="Center" DataContext="{Binding ForwardObject}" VerticalAlignment="Center">
317-
<AppBarButton LabelPosition="Collapsed" Style="{ThemeResource AppBarButtonFixedStyle}" IsEnabled="{x:Bind local2:ItemViewModel.FS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="Forward" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Top" Height="50" Width="50" HorizontalAlignment="Left">
318-
<AppBarButton.ContentTemplate>
319-
<DataTemplate>
320-
<TextBlock Text="&#xE76C;" FontFamily="Segoe MDL2 Assets" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" />
321-
</DataTemplate>
322-
</AppBarButton.ContentTemplate>
323-
</AppBarButton>
324-
</Grid>
325-
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" TextAlignment="Center" HorizontalAlignment="Center" Text="Forward" Width="60"/>
326-
</StackPanel>
327-
<StackPanel Orientation="Vertical" Margin="2">
328-
<AppBarButton LabelPosition="Collapsed" HorizontalAlignment="Center" x:Name="Refresh" Style="{ThemeResource AppBarButtonFixedStyle}" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50">
329-
<AppBarButton.ContentTemplate>
330-
<DataTemplate>
331-
<TextBlock Text="&#xE72C;" FontFamily="Segoe MDL2 Assets" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" />
332-
</DataTemplate>
333-
</AppBarButton.ContentTemplate>
334313
</AppBarButton>
335-
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Refresh" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
336-
</StackPanel>
337-
<StackPanel Orientation="Vertical" Margin="2">
338-
<AppBarButton LabelPosition="Collapsed" HorizontalAlignment="Center" x:Name="AddItem" Style="{ThemeResource AppBarButtonFixedStyle}" Content="&#xE710;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
339-
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Add Item" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
340-
</StackPanel>
341-
<StackPanel Orientation="Vertical" Margin="2">
342-
<AppBarButton LabelPosition="Collapsed" IsEnabled="{x:Bind local3:Interaction.PS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" x:Name="Paste" Style="{ThemeResource AppBarButtonFixedStyle}" Content="&#xE77F;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
343-
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Paste" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
344-
</StackPanel>
345-
<StackPanel Orientation="Vertical" Margin="2">
346-
<AppBarButton LabelPosition="Collapsed" HorizontalAlignment="Center" x:Name="GetPath" Style="{ThemeResource AppBarButtonFixedStyle}" Content="&#xF271;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
347-
<TextBlock TextWrapping="WrapWholeWords" VerticalAlignment="Bottom" Text="Copy Path" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
348-
</StackPanel>
349-
<StackPanel Orientation="Vertical" Margin="2">
350-
<AppBarButton LabelPosition="Collapsed" HorizontalAlignment="Center" x:Name="ViewMode" Style="{ThemeResource AppBarButtonFixedStyle}" Content="&#xF0E2;" FontFamily="Segoe MDL2 Assets" FontSize="20" VerticalAlignment="Center" Width="50" Height="50" />
351-
<TextBlock VerticalAlignment="Bottom" TextWrapping="WrapWholeWords" Text="Layout Mode" HorizontalAlignment="Center" TextAlignment="Center" Width="60"/>
352-
</StackPanel>
353-
</StackPanel>
354-
355-
356314

315+
<AppBarButton LabelPosition="Collapsed" IsEnabled="{x:Bind local2:ItemViewModel.FS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="Forward">
316+
<AppBarButton.Icon>
357317

358-
</Grid>
318+
<FontIcon Glyph="&#xE76C;" FontFamily="Segoe MDL2 Assets"/>
319+
320+
</AppBarButton.Icon>
321+
</AppBarButton>
359322

360-
<ScrollViewer Padding="5" HorizontalScrollMode="Auto" HorizontalScrollBarVisibility="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Row="1" >
323+
324+
</StackPanel>
325+
</CommandBar.Content>
326+
327+
<CommandBar.SecondaryCommands>
328+
<AppBarButton Label="Paste" IsEnabled="{x:Bind local3:Interaction.PS.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" x:Name="Paste">
329+
<AppBarButton.Icon>
330+
<FontIcon Glyph="&#xE77F;" FontFamily="Segoe MDL2 Assets"/>
331+
</AppBarButton.Icon>
332+
</AppBarButton>
333+
<AppBarButton x:Name="GetPath" Label="Copy Full Path">
334+
<AppBarButton.Icon>
335+
<FontIcon Glyph="&#xF271;" FontFamily="Segoe MDL2 Assets"/>
336+
</AppBarButton.Icon>
337+
</AppBarButton>
338+
<AppBarButton x:Name="ViewMode" Label="Layout Mode">
339+
<AppBarButton.Icon>
340+
<FontIcon Glyph="&#xF0E2;" FontFamily="Segoe MDL2 Assets"/>
341+
</AppBarButton.Icon>
342+
</AppBarButton>
343+
</CommandBar.SecondaryCommands>
344+
345+
346+
<AppBarButton Label="Refresh" x:Name="Refresh" >
347+
<AppBarButton.ContentTemplate>
348+
<DataTemplate>
349+
<TextBlock Text="&#xE72C;" FontFamily="Segoe MDL2 Assets" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" />
350+
</DataTemplate>
351+
</AppBarButton.ContentTemplate>
352+
</AppBarButton>
353+
354+
355+
<AppBarButton x:Name="AddItem" Label="Add Item" >
356+
<AppBarButton.ContentTemplate>
357+
<DataTemplate>
358+
<TextBlock Text="&#xE710;" FontFamily="Segoe MDL2 Assets" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" />
359+
</DataTemplate>
360+
</AppBarButton.ContentTemplate>
361+
</AppBarButton>
362+
</CommandBar>
363+
364+
<ScrollViewer Margin="24,0,0,0" Padding="5" HorizontalScrollMode="Auto" HorizontalScrollBarVisibility="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Top" Grid.Row="2" >
361365
<TextBlock x:Name="VisiblePath" Text="{x:Bind Mode=TwoWay, Path=local:GenericFileBrowser.P.path, UpdateSourceTrigger=PropertyChanged}" FontFamily="Segoe UI Black" FontWeight="Bold" FontSize="32" ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" VerticalAlignment="Top" Margin="0,0,0,0" Grid.Row="1"/>
362366
</ScrollViewer>
363367

364-
<Grid Grid.Row="2" HorizontalAlignment="Left" Margin="0,0,0,0">
368+
<Grid Margin="24,0,0,0" Grid.Row="3" HorizontalAlignment="Left">
365369

366-
<controls:DataGrid CellEditEnded="AllView_CellEditEnded" FocusVisualPrimaryThickness="0" SelectionMode="Extended" IsDoubleTapEnabled="True" x:FieldModifier="public" x:Name="AllView" Drop="AllView_DropAsync" AutoGenerateColumns="False" CanDrag="False" AllowDrop="True" DragOver="AllView_DragOver" IsRightTapEnabled="True" CanUserReorderColumns="False" IsReadOnly="False" ItemsSource="{x:Bind local2:ItemViewModel.FilesAndFolders}" Margin="0,0,0,0" Padding="0, 0, 0, 0" HorizontalAlignment="Left">
370+
<controls:DataGrid CellEditEnded="AllView_CellEditEnded" FocusVisualPrimaryThickness="0" SelectionMode="Extended" IsDoubleTapEnabled="True" x:FieldModifier="public" x:Name="AllView" Drop="AllView_DropAsync" AutoGenerateColumns="False" CanDrag="False" AllowDrop="True" DragOver="AllView_DragOver" IsRightTapEnabled="True" CanUserReorderColumns="False" IsReadOnly="False" ItemsSource="{x:Bind local2:ItemViewModel.FilesAndFolders}" Margin="0,0,0,0" Padding="0, 0, 0, 0" HorizontalAlignment="Stretch">
367371

368372
<controls:DataGrid.Resources>
369373
<MenuFlyout x:Name="HeaderRightClickMenu" x:Key="HeaderRightClickFlyout">
@@ -514,6 +518,7 @@
514518
<ProgressBar Name="pbar" Value="{x:Bind local2:ItemViewModel.PROGRESSPER.prog, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" Height="8" HorizontalAlignment="Center" Width="450" Margin="0,50,0,0"/>
515519
</Grid>
516520
</controls:DropShadowPanel>
521+
517522
</Grid>
518523

519524

0 commit comments

Comments
 (0)