Skip to content

Commit 99dded7

Browse files
Apply XAML Styler changes
1 parent 78dacf4 commit 99dded7

File tree

6 files changed

+1003
-851
lines changed

6 files changed

+1003
-851
lines changed

Microsoft.Toolkit.Uwp.SampleApp/App.xaml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
55
RequiresPointerMode="Auto">
66

7-
<Application.Resources>
8-
<ResourceDictionary>
9-
<!-- Color Resources -->
10-
<ResourceDictionary.MergedDictionaries>
11-
<ResourceDictionary Source="ms-appx:///Styles/Themes.xaml" />
12-
<ResourceDictionary Source="ms-appx:///Styles/Generic.xaml" />
7+
<Application.Resources>
8+
<ResourceDictionary>
9+
<!-- Color Resources -->
10+
<ResourceDictionary.MergedDictionaries>
11+
<ResourceDictionary Source="ms-appx:///Styles/Themes.xaml" />
12+
<ResourceDictionary Source="ms-appx:///Styles/Generic.xaml" />
1313

14-
<!-- WinUI -->
15-
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"/>
16-
</ResourceDictionary.MergedDictionaries>
14+
<!-- WinUI -->
15+
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
16+
</ResourceDictionary.MergedDictionaries>
1717

18-
<!-- Converters -->
19-
<converters:BoolNegationConverter x:Key="BoolNegationConverter" />
18+
<!-- Converters -->
19+
<converters:BoolNegationConverter x:Key="BoolNegationConverter" />
2020

21-
<converters:EmptyStringToObjectConverter x:Key="EmptyStringToObject"
22-
EmptyValue="Collapsed"
23-
NotEmptyValue="Visible" />
21+
<converters:EmptyStringToObjectConverter x:Key="EmptyStringToObject"
22+
EmptyValue="Collapsed"
23+
NotEmptyValue="Visible" />
2424

25-
<converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
26-
</ResourceDictionary>
27-
</Application.Resources>
25+
<converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
26+
</ResourceDictionary>
27+
</Application.Resources>
2828
</Application>

Microsoft.Toolkit.Uwp.SampleApp/Controls/CodeRenderer.xaml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
<ResourceDictionary
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:controls="using:Microsoft.Toolkit.Uwp.SampleApp.Controls"
5-
xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Controls">
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:controls="using:Microsoft.Toolkit.Uwp.SampleApp.Controls"
4+
xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Controls">
65

76
<Style TargetType="controls:CodeRenderer">
87
<Setter Property="Template">
@@ -14,25 +13,24 @@
1413
<RowDefinition Height="Auto" />
1514
</Grid.RowDefinitions>
1615
<Grid x:Name="Container"
17-
Grid.RowSpan="2"
18-
Opacity="0" />
19-
<ScrollViewer
20-
Grid.Row="0"
21-
HorizontalScrollMode="Auto"
22-
HorizontalScrollBarVisibility="Auto">
16+
Grid.RowSpan="2"
17+
Opacity="0" />
18+
<ScrollViewer Grid.Row="0"
19+
HorizontalScrollBarVisibility="Auto"
20+
HorizontalScrollMode="Auto">
2321
<RichTextBlock Name="codeView"
24-
FontFamily="Consolas"
25-
Padding="10" />
22+
Padding="10"
23+
FontFamily="Consolas" />
2624
</ScrollViewer>
2725
<StackPanel Grid.Row="1"
28-
HorizontalAlignment="Center"
29-
Orientation="Horizontal">
26+
HorizontalAlignment="Center"
27+
Orientation="Horizontal">
3028
<Button x:Name="CopyButton"
31-
Margin="5"
32-
Content="Copy" />
29+
Margin="5"
30+
Content="Copy" />
3331
<Button x:Name="PrintButton"
34-
Margin="5"
35-
Content="Print" />
32+
Margin="5"
33+
Content="Print" />
3634
</StackPanel>
3735
</Grid>
3836
</ControlTemplate>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,8 @@
922922
"Subcategory": "Developer",
923923
"About": "The MVVM Toolkit package is a modern, fast, and modular MVVM library for .NET Standard 2.0.",
924924
"Icon": "/Assets/Helpers.png",
925-
"DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/mvvm/Introduction.md"
925+
"DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/mvvm/Introduction.md",
926+
"CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/master/Microsoft.Toolkit.Mvvm"
926927
},
927928
{
928929
"Name": "CompareStateTrigger",

0 commit comments

Comments
 (0)