Skip to content

Commit 06daa7c

Browse files
wongjiahauwongjiahau
committed
Successfully injected XamlDisplayerPanel into Buttons.xaml
1 parent e9e6e24 commit 06daa7c

File tree

2 files changed

+47
-55
lines changed

2 files changed

+47
-55
lines changed

‎MainDemo.Wpf/Buttons.xaml

Lines changed: 42 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -26,65 +26,63 @@
2626
<materialDesignConverters:BooleanToVisibilityConverter x:Key="InvertedBooleanToVisibilityConverter" TrueValue="Collapsed" FalseValue="Visible" />
2727
</ResourceDictionary>
2828
</UserControl.Resources>
29-
<ScrollViewer>
3029
<codeDisplayer:XamlDisplayerPanel x:Name="XamlDisplayerPanel">
31-
<Button Style="{StaticResource MaterialDesignRaisedLightButton}" Margin="0 12 8 0" Width="100"
30+
<Button Style="{StaticResource MaterialDesignRaisedLightButton}" Width="100"
3231
ToolTip="Resource name: MaterialDesignRaisedLightButton">
3332
_LIGHT
3433
</Button>
35-
<Button Style="{StaticResource MaterialDesignRaisedButton}" Margin="0 12 8 0" Width="100"
34+
<Button Style="{StaticResource MaterialDesignRaisedButton}" Width="100"
3635
ToolTip="Resource name: MaterialDesignRaisedButton">
3736
_MID
3837
</Button>
39-
<Button Style="{StaticResource MaterialDesignRaisedDarkButton}" Margin="0 12 8 0" Width="100"
38+
<Button Style="{StaticResource MaterialDesignRaisedDarkButton}" Width="100"
4039
ToolTip="Resource name: MaterialDesignRaisedLightDarkButton">
4140
_DARK
4241
</Button>
43-
<Button Style="{StaticResource MaterialDesignRaisedAccentButton}" Margin="0 12 16 0" Width="100"
42+
<Button Style="{StaticResource MaterialDesignRaisedAccentButton}" Width="100"
4443
ToolTip="Resource name: MaterialDesignRaisedAccentButton">
4544
ACCENT
4645
</Button>
47-
<materialDesign:Badged Margin="0 12 16 4" Badge="3">
46+
<materialDesign:Badged Badge="3">
4847
<Button>MAIL</Button>
4948
</materialDesign:Badged>
5049

51-
<materialDesign:Badged Margin="0 12 16 4" Badge="{materialDesign:PackIcon Heart}"
50+
<materialDesign:Badged Badge="{materialDesign:PackIcon Heart}"
5251
BadgeColorZoneMode="Accent">
5352
<Button>LOVE</Button>
5453
</materialDesign:Badged>
5554

56-
<materialDesign:Badged Margin="0 12 28 4" Badge="DANGER"
55+
<materialDesign:Badged Badge="DANGER"
5756
BadgeColorZoneMode="Dark">
5857
<Button>STATUS</Button>
5958
</materialDesign:Badged>
60-
<materialDesign:Badged Margin="0 12 28 4"
59+
<materialDesign:Badged
6160
x:Name="CountingBadge"
6261
BadgeColorZoneMode="PrimaryDark">
6362
<Button Style="{StaticResource MaterialDesignRaisedLightButton}"
6463
Click="CountingButton_OnClick">CLICK ME!</Button>
6564
</materialDesign:Badged>
6665
<Button Content="{materialDesign:PackIcon AirplaneTakeoff}"
67-
Margin="0 12 8 4"
66+
6867
ToolTip="Icon">
6968
</Button>
7069

7170
<Button Style="{StaticResource MaterialDesignRaisedAccentButton}"
72-
Margin="0 0 8 0"
71+
7372
Width="150"
7473
ToolTip="Resource name: MaterialDesignRaisedAccentButton"
7574
materialDesign:RippleAssist.Feedback="#DD000000">CUSTOM RIPPLE</Button>
7675
<Button Style="{StaticResource MaterialDesignRaisedAccentButton}"
77-
Margin="0 0 8 0"
76+
7877
Width="150"
7978
ToolTip="Resource name: MaterialDesignRaisedAccentButton"
8079
materialDesign:RippleAssist.IsDisabled="True">NO RIPPLE</Button>
81-
<RepeatButton Margin="0 0 8 0" Width="100"
80+
<RepeatButton Width="100"
8281
ToolTip="Resource name: MaterialDesignRaisedButton">
8382
REPEAT
8483
</RepeatButton>
85-
<Button Style="{StaticResource MaterialDesignFlatButton}" Click="ButtonBase_OnClick" ToolTip="MaterialDesignFlatButton" Margin="200 0 0 0">ACCEPT</Button>
84+
<Button Style="{StaticResource MaterialDesignFlatButton}" Click="ButtonBase_OnClick" ToolTip="MaterialDesignFlatButton">ACCEPT</Button>
8685
<Button Style="{StaticResource MaterialDesignFlatButton}" ToolTip="MaterialDesignFlatButton">CANCEL</Button>
87-
<Border Margin="0 16 0 0" BorderThickness="0 1 0 0" BorderBrush="{DynamicResource MaterialDesignDivider}" Grid.Row="4" />
8886
<Grid Width="124">
8987
<Button Command="{Binding DismissComand}"
9088
Style="{StaticResource MaterialDesignRaisedButton}"
@@ -93,15 +91,15 @@
9391
Visibility="{Binding ShowDismissButton, Converter={StaticResource BooleanToVisibilityConverter}}">
9492
<StackPanel Orientation="Horizontal">
9593
<TextBlock>DISMISS</TextBlock>
96-
<materialDesign:PackIcon Margin="4 .5 0 0" Kind="Close" />
94+
<materialDesign:PackIcon Kind="Close" />
9795
</StackPanel>
9896
</Button>
9997
<TextBlock Text="{Binding DemoRestartCountdownText}"
10098
VerticalAlignment="Center"
10199
Visibility="{Binding ShowDismissButton, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"
102100
/>
103101
</Grid>
104-
<Button Style="{StaticResource MaterialDesignFloatingActionLightButton}" Margin="8 0 0 0"
102+
<Button Style="{StaticResource MaterialDesignFloatingActionLightButton}"
105103
Command="{Binding SaveComand}"
106104
materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding IsSaving}"
107105
materialDesign:ButtonProgressAssist.Value="{Binding SaveProgress}">
@@ -128,16 +126,16 @@
128126
</materialDesign:PackIcon>
129127

130128
</Button>
131-
<Button Style="{StaticResource MaterialDesignFloatingActionButton}" Margin="16 0 0 0"
129+
<Button Style="{StaticResource MaterialDesignFloatingActionButton}"
132130
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
133131
materialDesign:ButtonProgressAssist.Value="-1"
134132
materialDesign:ButtonProgressAssist.IsIndeterminate="True"
135133
Content="{materialDesign:PackIcon DotsHorizontal}" />
136-
<Button Style="{StaticResource MaterialDesignFloatingActionAccentButton}" Margin="16 0 0 0"
134+
<Button Style="{StaticResource MaterialDesignFloatingActionAccentButton}"
137135
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
138136
materialDesign:ButtonProgressAssist.Value="50"
139137
Content="{materialDesign:PackIcon DotsHorizontal}" />
140-
<Button Style="{StaticResource MaterialDesignFloatingActionButton}" Margin="16 0 0 0"
138+
<Button Style="{StaticResource MaterialDesignFloatingActionButton}"
141139
Background="#81d4fa"
142140
BorderBrush="#81d4fa"
143141
Foreground="#DD000000"
@@ -146,22 +144,22 @@
146144
materialDesign:ButtonProgressAssist.IndicatorForeground="#e65100"
147145
materialDesign:ButtonProgressAssist.IndicatorBackground="#ffcc80"
148146
Content="{materialDesign:PackIcon DotsHorizontal}" />
149-
<Button Style="{StaticResource MaterialDesignFloatingActionMiniDarkButton}" Margin="16 0 0 0"
147+
<Button Style="{StaticResource MaterialDesignFloatingActionMiniDarkButton}"
150148
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
151149
materialDesign:ButtonProgressAssist.Value="75"
152150
Content="{materialDesign:PackIcon DotsHorizontal}" />
153-
<ToggleButton Content="C" Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionLightToggleButton}" IsChecked="True"
151+
<ToggleButton Content="C" Style="{StaticResource MaterialDesignActionLightToggleButton}" IsChecked="True"
154152
ToolTip="MaterialDesignActionLightToggleButton"/>
155-
<ToggleButton Content="H" Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionToggleButton}"
153+
<ToggleButton Content="H" Style="{StaticResource MaterialDesignActionToggleButton}"
156154
ToolTip="MaterialDesignActionToggleButton"/>
157-
<CheckBox Content="E" Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionDarkCheckBox}"
155+
<CheckBox Content="E" Style="{StaticResource MaterialDesignActionDarkCheckBox}"
158156
ToolTip="MaterialDesignActionDarkCheckBox"/>
159-
<ToggleButton Content="C" Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionAccentToggleButton}"
157+
<ToggleButton Content="C" Style="{StaticResource MaterialDesignActionAccentToggleButton}"
160158
IsChecked="True"
161159
ToolTip="MaterialDesignActionAccentToggleButton"/>
162-
<ToggleButton Content="K" Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionToggleButton}" IsEnabled="False"
160+
<ToggleButton Content="K" Style="{StaticResource MaterialDesignActionToggleButton}" IsEnabled="False"
163161
ToolTip="MaterialDesignActionToggleButton"/>
164-
<ToggleButton Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionToggleButton}"
162+
<ToggleButton Style="{StaticResource MaterialDesignActionToggleButton}"
165163
ToolTip="MaterialDesignActionToggleButton">
166164
<Image Source="Resources/ProfilePic.jpg"></Image>
167165
</ToggleButton>
@@ -174,7 +172,7 @@
174172
<materialDesign:PackIcon Kind="EmoticonHappy" />
175173
</materialDesign:ToggleButtonAssist.OnContent>
176174
</ToggleButton>
177-
<RadioButton Style="{StaticResource MaterialDesignRadioButton}" Margin="0 0 8 8" VerticalAlignment="Center" Tag="True">
175+
<RadioButton Style="{StaticResource MaterialDesignRadioButton}" VerticalAlignment="Center" Tag="True">
178176
<RadioButton.IsChecked>
179177
<Binding Path="Tag" RelativeSource="{RelativeSource Self}">
180178
<Binding.ValidationRules>
@@ -184,17 +182,17 @@
184182
</RadioButton.IsChecked>
185183
Radio
186184
</RadioButton>
187-
<RadioButton Style="{StaticResource MaterialDesignRadioButton}" Margin="0 0 8 8" VerticalAlignment="Center">
185+
<RadioButton Style="{StaticResource MaterialDesignRadioButton}" VerticalAlignment="Center">
188186
Ga Ga
189187
</RadioButton>
190-
<RadioButton Style="{StaticResource MaterialDesignRadioButton}" Margin="0 0 8 8" VerticalAlignment="Center"
188+
<RadioButton Style="{StaticResource MaterialDesignRadioButton}" VerticalAlignment="Center"
191189
IsEnabled="False">
192190
Disabled
193191
</RadioButton>
194-
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" Margin="0 0 8 8" VerticalAlignment="Center">
192+
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" VerticalAlignment="Center">
195193
Check
196194
</CheckBox>
197-
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" Margin="0 0 8 8" VerticalAlignment="Center" Tag="True">
195+
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" VerticalAlignment="Center" Tag="True">
198196
<CheckBox.IsChecked>
199197
<Binding Path="Tag" RelativeSource="{RelativeSource Self}">
200198
<Binding.ValidationRules>
@@ -204,22 +202,22 @@
204202
</CheckBox.IsChecked>
205203
Mate
206204
</CheckBox>
207-
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" Margin="0 0 8 8" VerticalAlignment="Center"
205+
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" VerticalAlignment="Center"
208206
IsEnabled="False" IsChecked="True">
209207
Disabled
210208
</CheckBox>
211209
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center"
212210
ToolTip="Default ToggleButton Style"/>
213-
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0" IsEnabled="False" />
214-
<ToggleButton Style="{StaticResource MaterialDesignSwitchLightToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
211+
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center" IsEnabled="False" />
212+
<ToggleButton Style="{StaticResource MaterialDesignSwitchLightToggleButton}" VerticalAlignment="Center"
215213
ToolTip="MaterialDesignSwitchLightToggleButton" IsChecked="True" />
216-
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
214+
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center"
217215
ToolTip="MaterialDesignSwitchToggleButton" IsChecked="True" />
218-
<ToggleButton Style="{StaticResource MaterialDesignSwitchDarkToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
216+
<ToggleButton Style="{StaticResource MaterialDesignSwitchDarkToggleButton}" VerticalAlignment="Center"
219217
ToolTip="MaterialDesignSwitchDarkToggleButton" IsChecked="True" />
220-
<ToggleButton Style="{StaticResource MaterialDesignSwitchAccentToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
218+
<ToggleButton Style="{StaticResource MaterialDesignSwitchAccentToggleButton}" VerticalAlignment="Center"
221219
ToolTip="MaterialDesignSwitchAccentToggleButton" IsChecked="True" />
222-
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
220+
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center"
223221
ToolTip="MaterialDesignSwitchToggleButton with Content and ToggleButtonAssist.OnContent">
224222
<materialDesign:PackIcon Kind="Pin" RenderTransformOrigin=".5,.5">
225223
<materialDesign:PackIcon.RenderTransform>
@@ -236,14 +234,14 @@
236234
<materialDesign:PackIcon Kind="Paperclip" Height="21" Width="21" />
237235
</ToggleButton>
238236
<ToggleButton Style="{StaticResource MaterialDesignFlatPrimaryToggleButton}"
239-
Margin="8 0 0 0"
237+
240238
ToolTip="MaterialDesignFlatPrimaryToggleButton"
241239
IsChecked="True">
242240
<materialDesign:PackIcon Kind="Heart" Height="21" Width="21" />
243241
</ToggleButton>
244242
<ToggleButton Style="{StaticResource MaterialDesignFlatPrimaryToggleButton}"
245243
ToolTip="MaterialDesignFlatPrimaryToggleButton"
246-
IsEnabled="False" Margin="8 0 0 0">
244+
IsEnabled="False">
247245
<materialDesign:PackIcon Kind="Heart" Height="21" Width="21" />
248246
</ToggleButton>
249247
<ListBox Grid.Column="1" Grid.Row="0" Style="{StaticResource MaterialDesignToolToggleListBox}" SelectedIndex="0">
@@ -286,8 +284,8 @@
286284
</ListBoxItem>
287285
</ListBox>
288286
<materialDesign:RatingBar Value="3" x:Name="BasicRatingBar" />
289-
<TextBlock Text="{Binding ElementName=BasicRatingBar, Path=Value, StringFormat=Rating: {0}}" VerticalAlignment="Top" Margin="10,2,0,0" />
290-
<materialDesign:RatingBar x:Name="CustomRatingBar" Max="3" Value="2" Margin="24 0 0 0" Orientation="Vertical">
287+
<TextBlock Width="100" Text="{Binding ElementName=BasicRatingBar, Path=Value, StringFormat=Rating: {0}}" VerticalAlignment="Top" />
288+
<materialDesign:RatingBar x:Name="CustomRatingBar" Max="3" Value="2" Orientation="Vertical">
291289
<materialDesign:RatingBar.ValueItemTemplate>
292290
<DataTemplate DataType="system:Int32">
293291
<Grid>
@@ -299,7 +297,6 @@
299297
</DataTemplate>
300298
</materialDesign:RatingBar.ValueItemTemplate>
301299
</materialDesign:RatingBar>
302-
<TextBlock Text="{Binding ElementName=CustomRatingBar, Path=Value, StringFormat=Rating: {0}}" VerticalAlignment="Top" Margin="10,2,0,0" />
300+
<TextBlock Width="100" Height="30" Text="{Binding ElementName=CustomRatingBar, Path=Value, StringFormat=Rating: {0}}" VerticalAlignment="Top" />
303301
</codeDisplayer:XamlDisplayerPanel>
304-
</ScrollViewer>
305302
</UserControl>

‎MainDemo.Wpf/Buttons.xaml.cs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,12 @@ public Buttons()
2929
InitializeComponent();
3030

3131
FloatingActionDemoCommand = new AnotherCommandImplementation(Execute);
32-
//var xmlDoc = new XmlDocument();
33-
//string source = File.ReadAllText(@"..\..\Buttons.xaml");
34-
//xmlDoc.LoadXml(source);
35-
XmlDocument xmlDoc =
36-
new MaterialDesignInXamlToolkitGitHubFile(
37-
ownerName: "wongjiahau" ,
38-
branchName: "New-Demo-2" ,
39-
fileName: "Buttons.xaml")
40-
.GetXmlDocument();
32+
var xmlDoc = new XmlDocument();
33+
string source = File.ReadAllText(@"..\..\Buttons.xaml");
34+
xmlDoc.LoadXml(source);
4135
XamlDisplayerPanel.Initialize(xmlDoc);
42-
}
36+
//XamlDisplayerPanel.Initialize(new MaterialDesignInXamlToolkitGitHubFile(this.GetType().Name).GetXmlDocument());
37+
}
4338

4439
public ICommand FloatingActionDemoCommand { get; }
4540

0 commit comments

Comments
 (0)