Skip to content

Commit 5f7276d

Browse files
committed
removed AppBar
1 parent e5faf9e commit 5f7276d

File tree

4 files changed

+9
-289
lines changed

4 files changed

+9
-289
lines changed

MainDemo.Wpf/MainWindow.xaml

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,16 @@
2323
</Window.Resources>
2424

2525
<DockPanel>
26-
<wpf:AppBar DockPanel.Dock="Top" x:Name="ActionBar" Title="Material Design in XAML Toolkit" IsNavigationDrawerOpen="True" ShowNavigationDrawerButton="True" SearchFormVisibility="Folded" SearchHint="Enter your search">
27-
<Button Style="{StaticResource MaterialDesignToolForegroundButton}">
28-
<Viewbox Width="24" Height="24">
29-
<Canvas Width="24" Height="24">
30-
<Path Data="M16.5,6V17.5A4,4 0 0,1 12.5,21.5A4,4 0 0,1 8.5,17.5V5A2.5,2.5 0 0,1 11,2.5A2.5,2.5 0 0,1 13.5,5V15.5A1,1 0 0,1 12.5,16.5A1,1 0 0,1 11.5,15.5V6H10V15.5A2.5,2.5 0 0,0 12.5,18A2.5,2.5 0 0,0 15,15.5V5A4,4 0 0,0 11,1A4,4 0 0,0 7,5V17.5A5.5,5.5 0 0,0 12.5,23A5.5,5.5 0 0,0 18,17.5V6H16.5Z" Fill="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=Button}, Path=Foreground}" />
31-
</Canvas>
32-
</Viewbox>
33-
</Button>
34-
<Button Style="{StaticResource MaterialDesignToolForegroundButton}">
35-
<Viewbox Width="24" Height="24">
36-
<Canvas Width="24" Height="24">
37-
<Path Data="M12,20A7,7 0 0,1 5,13A7,7 0 0,1 12,6A7,7 0 0,1 19,13A7,7 0 0,1 12,20M12,4A9,9 0 0,0 3,13A9,9 0 0,0 12,22A9,9 0 0,0 21,13A9,9 0 0,0 12,4M12.5,8H11V14L15.75,16.85L16.5,15.62L12.5,13.25V8M7.88,3.39L6.6,1.86L2,5.71L3.29,7.24L7.88,3.39M22,5.72L17.4,1.86L16.11,3.39L20.71,7.25L22,5.72Z" Fill="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=Button}, Path=Foreground}" />
38-
</Canvas>
39-
</Viewbox>
40-
</Button>
41-
</wpf:AppBar>
26+
<wpf:ColorZone Padding="16" Effect="{StaticResource MaterialDesignShadowDepth2}"
27+
Mode="PrimaryMid" DockPanel.Dock="Top">
28+
<DockPanel>
29+
<ToggleButton Style="{StaticResource MaterialDesignHamburgerToggleButton}" IsChecked="True"
30+
x:Name="MenuToggleButton"/>
31+
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="22">Material Design In XAML Toolkit</TextBlock>
32+
</DockPanel>
33+
</wpf:ColorZone>
4234
<ListBox DockPanel.Dock="Left" x:Name="DemoItemsListBox" Margin="16 16 0 16" SelectedIndex="0"
43-
Visibility="{Binding ElementName=ActionBar, Path=IsNavigationDrawerOpen, Converter={StaticResource BooleanToVisibilityConverter}}">
35+
Visibility="{Binding ElementName=MenuToggleButton, Path=IsChecked, Converter={StaticResource BooleanToVisibilityConverter}}">
4436
<ListBox.ItemTemplate>
4537
<DataTemplate DataType="domain:DemoItem">
4638
<TextBlock Text="{Binding Name}" />

MaterialDesignThemes.Wpf/AppBar.xaml

Lines changed: 0 additions & 113 deletions
This file was deleted.

MaterialDesignThemes.Wpf/AppBar.xaml.cs

Lines changed: 0 additions & 152 deletions
This file was deleted.

MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@
5656
<Reference Include="PresentationFramework" />
5757
</ItemGroup>
5858
<ItemGroup>
59-
<Page Include="AppBar.xaml">
60-
<SubType>Designer</SubType>
61-
<Generator>MSBuild:Compile</Generator>
62-
</Page>
6359
<Page Include="ProgressLoopDev.xaml">
6460
<SubType>Designer</SubType>
6561
<Generator>MSBuild:Compile</Generator>
@@ -198,9 +194,6 @@
198194
</Page>
199195
</ItemGroup>
200196
<ItemGroup>
201-
<Compile Include="AppBar.xaml.cs">
202-
<DependentUpon>AppBar.xaml</DependentUpon>
203-
</Compile>
204197
<Compile Include="Card.cs" />
205198
<Compile Include="Clock.cs" />
206199
<Compile Include="ClockChoiceMadeEventArgs.cs" />

0 commit comments

Comments
 (0)