Skip to content

Commit 5da118a

Browse files
author
eriklimakc
committed
chore: fix indentation
1 parent 0964b6e commit 5da118a

31 files changed

+345
-379
lines changed

‎UI/Navigation/src/Navigation/App.xaml.cs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
8484

8585
// FIXME: Using the URL address bar to navigate doesn't work
8686
// eg: http://localhost:5000/Main/ToFromQuery?QueryUser.Id=2b64071a-2c8a-45e4-9f48-3eb7d7aace41
87+
// https://github.com/unoplatform/uno.extensions/issues/2488
8788
new DataViewMap<ToFromQueryPage, ToFromQueryViewModel, QueryUser>(
8889
ToQuery: user => new Dictionary<string, string>
8990
{
@@ -111,17 +112,17 @@ private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
111112
new ("Main", View: views.FindByViewModel<MainViewModel>(),
112113
Nested:
113114
[
114-
#region Page Navigation
115+
#region Page Navigation
115116
new ("PageNavigation", View: views.FindByViewModel<PageNavigationViewModel>(), IsDefault: true),
116117
new ("Sample", View: views.FindByView<SamplePage>(), DependsOn: "PageNavigation"),
117-
#endregion
118+
#endregion
118119

119-
#region ContentControl Navigation
120+
#region ContentControl Navigation
120121
new ("CControlNavigation", View: views.FindByView<CControlNavigationPage>()),
121122
new ("CControlRight", View: views.FindByView<CControlRightPage>(), DependsOn: "CControlNavigation"),
122-
#endregion
123+
#endregion
123124

124-
#region TabBar Navigation
125+
#region TabBar Navigation
125126
new ("TabBarNavigation", View: views.FindByView<TabBarNavigationPage>(),
126127
Nested:
127128
[
@@ -130,29 +131,29 @@ private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
130131
new ("TBThree", View: views.FindByView<TabBarItem3>())
131132
]
132133
),
133-
#endregion
134+
#endregion
134135

135-
#region TabBar with Data Navigation
136+
#region TabBar with Data Navigation
136137
new ("TabBarWithData", View: views.FindByViewModel<TabBarWithDataViewModel>(),
137138
Nested:
138139
[
139140
new ("TBDataOne", View: views.FindByViewModel<FirstTabBarItemWithDataViewModel>()),
140141
new ("TBDataTwo", View: views.FindByViewModel<SecondTabBarItemWithDataViewModel>())
141142
]
142143
),
143-
#endregion
144+
#endregion
144145

145-
#region Request a Value
146+
#region Request a Value
146147
new ("RequestValueMain", View: views.FindByViewModel<RequestValueMainViewModel>()),
147148
new ("RequestValueSecond", View: views.FindByViewModel<RequestValueSecondViewModel>(), DependsOn: "RequestValueMain"),
148-
#endregion
149+
#endregion
149150

150-
#region Message Dialog
151+
#region Message Dialog
151152
new ("MessageDialog", View: views.FindByViewModel<MessageDialogViewModel>()),
152153
new ("MyMessage", View: messageDialog),
153-
#endregion
154+
#endregion
154155

155-
#region Modal Dialog
156+
#region Modal Dialog
156157
new ("ModalDialog", View: views.FindByViewModel<ModalDialogViewModel>()),
157158
new ("ModalDialogSecond", View: views.FindByView<ModalDialogSecondPage>()),
158159
new ("ModalContentDialog", View: views.FindByView<ModalContentDialog>()),
@@ -161,13 +162,13 @@ private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
161162
new ("ComplexFlyoutOne", View: views.FindByViewModel<ComplexFlyoutOneViewModel>(), IsDefault:true),
162163
new ("ComplexFlyoutSecond", View: views.FindByViewModel<ComplexFlyoutTwoViewModel>(), DependsOn: "ComplexFlyoutOne")
163164
]),
164-
#endregion
165+
#endregion
165166

166-
#region ToFromQuery
167+
#region ToFromQuery
167168
new ("ToFromQuery", View: views.FindByViewModel<ToFromQueryViewModel>()),
168-
#endregion
169+
#endregion
169170

170-
#region Flyout Drawer
171+
#region Flyout Drawer
171172
new ("FlyoutDrawer", View: views.FindByView<FlyoutDrawerPage>(),
172173
Nested:
173174
[
@@ -176,9 +177,8 @@ private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
176177
new ("Third", View: views.FindByView<ThirdPage>())
177178
]),
178179
new ("NavFlyout", View: views.FindByView<NavFlyout>()),
179-
#endregion
180-
181-
]
180+
#endregion
181+
]
182182
)
183183
]
184184
)

‎UI/Navigation/src/Navigation/Presentation/ContentControlNavigation/CControlNavigationPage.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
<RowDefinition Height="Auto" />
1515
<RowDefinition />
1616
</Grid.RowDefinitions>
17-
<utu:NavigationBar Content="Content Control Navigation"
18-
Padding="60,0,0,0" />
17+
<utu:NavigationBar Padding="60,0,0,0" Content="Content Control Navigation" />
1918

2019
<Grid Grid.Row="1">
2120
<Grid.ColumnDefinitions>

‎UI/Navigation/src/Navigation/Presentation/FlyoutDrawer/FirstPage.xaml

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
11
<Page x:Class="Navigation.Presentation.FirstPage"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:local="using:Navigation.Presentation"
6-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:uen="using:Uno.Extensions.Navigation.UI"
8-
xmlns:utu="using:Uno.Toolkit.UI"
9-
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
10-
mc:Ignorable="d">
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5+
xmlns:local="using:Navigation.Presentation"
6+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7+
xmlns:uen="using:Uno.Extensions.Navigation.UI"
8+
xmlns:utu="using:Uno.Toolkit.UI"
9+
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
10+
mc:Ignorable="d">
1111

12-
<Grid utu:SafeArea.Insets="VisibleBounds">
13-
<Grid.RowDefinitions>
14-
<RowDefinition Height="Auto" />
15-
<RowDefinition />
16-
</Grid.RowDefinitions>
17-
<utu:NavigationBar Content="First Page"
18-
Padding="60,0,0,0">
19-
<utu:NavigationBar.MainCommand>
20-
<AppBarButton>
21-
<AppBarButton.Icon>
22-
<BitmapIcon UriSource="ms-appx:///Assets/Images/back.png" />
23-
</AppBarButton.Icon>
24-
</AppBarButton>
25-
</utu:NavigationBar.MainCommand>
26-
</utu:NavigationBar>
27-
<StackPanel Grid.Row="1"
28-
HorizontalAlignment="Center"
29-
VerticalAlignment="Center"
30-
Spacing="16">
31-
<Image Width="150"
32-
Height="150"
33-
Margin="12"
34-
HorizontalAlignment="Center"
35-
Source="ms-appx:///Assets/logo.png" />
36-
<TextBlock Text="First Page"
37-
HorizontalAlignment="Center"
38-
FontSize="40"/>
39-
</StackPanel>
40-
</Grid>
12+
<Grid utu:SafeArea.Insets="VisibleBounds">
13+
<Grid.RowDefinitions>
14+
<RowDefinition Height="Auto" />
15+
<RowDefinition />
16+
</Grid.RowDefinitions>
17+
<utu:NavigationBar Padding="60,0,0,0" Content="First Page">
18+
<utu:NavigationBar.MainCommand>
19+
<AppBarButton>
20+
<AppBarButton.Icon>
21+
<BitmapIcon UriSource="ms-appx:///Assets/Images/back.png" />
22+
</AppBarButton.Icon>
23+
</AppBarButton>
24+
</utu:NavigationBar.MainCommand>
25+
</utu:NavigationBar>
26+
<StackPanel Grid.Row="1"
27+
HorizontalAlignment="Center"
28+
VerticalAlignment="Center"
29+
Spacing="16">
30+
<Image Width="150"
31+
Height="150"
32+
Margin="12"
33+
HorizontalAlignment="Center"
34+
Source="ms-appx:///Assets/logo.png" />
35+
<TextBlock HorizontalAlignment="Center"
36+
FontSize="40"
37+
Text="First Page" />
38+
</StackPanel>
39+
</Grid>
4140
</Page>

‎UI/Navigation/src/Navigation/Presentation/FlyoutDrawer/FlyoutDrawerPage.xaml

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
11
<Page x:Class="Navigation.Presentation.FlyoutDrawerPage"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:local="using:Navigation.Presentation"
6-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:uen="using:Uno.Extensions.Navigation.UI"
8-
xmlns:utu="using:Uno.Toolkit.UI"
9-
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
10-
mc:Ignorable="d">
11-
12-
<ScrollViewer>
13-
<Grid utu:SafeArea.Insets="VisibleBounds">
14-
<Grid.RowDefinitions>
15-
<RowDefinition Height="Auto" />
16-
<RowDefinition />
17-
</Grid.RowDefinitions>
18-
<utu:NavigationBar Content="Flyout Drawer Page"
19-
Padding="60,0,0,0" />
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5+
xmlns:local="using:Navigation.Presentation"
6+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7+
xmlns:uen="using:Uno.Extensions.Navigation.UI"
8+
xmlns:utu="using:Uno.Toolkit.UI"
9+
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
10+
mc:Ignorable="d">
2011

21-
<StackPanel Grid.Row="1"
22-
HorizontalAlignment="Center"
23-
VerticalAlignment="Center"
24-
Spacing="16">
25-
<Image Width="150"
26-
Height="150"
27-
Margin="12"
28-
HorizontalAlignment="Center"
29-
Source="ms-appx:///Assets/logo.png" />
30-
<Button Content="Open Flyout"
31-
HorizontalAlignment="Center"
32-
uen:Navigation.Request="NavFlyout" />
33-
</StackPanel>
34-
</Grid>
35-
</ScrollViewer>
12+
<ScrollViewer>
13+
<Grid utu:SafeArea.Insets="VisibleBounds">
14+
<Grid.RowDefinitions>
15+
<RowDefinition Height="Auto" />
16+
<RowDefinition />
17+
</Grid.RowDefinitions>
18+
<utu:NavigationBar Padding="60,0,0,0" Content="Flyout Drawer Page" />
19+
20+
<StackPanel Grid.Row="1"
21+
HorizontalAlignment="Center"
22+
VerticalAlignment="Center"
23+
Spacing="16">
24+
<Image Width="150"
25+
Height="150"
26+
Margin="12"
27+
HorizontalAlignment="Center"
28+
Source="ms-appx:///Assets/logo.png" />
29+
<Button HorizontalAlignment="Center"
30+
uen:Navigation.Request="NavFlyout"
31+
Content="Open Flyout" />
32+
</StackPanel>
33+
</Grid>
34+
</ScrollViewer>
3635
</Page>

‎UI/Navigation/src/Navigation/Presentation/FlyoutDrawer/NavFlyout.xaml

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
<Flyout x:Class="Navigation.Presentation.NavFlyout"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:local="using:Navigation.Presentation"
6-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:uen="using:Uno.Extensions.Navigation.UI"
8-
xmlns:utu="using:Uno.Toolkit.UI"
9-
mc:Ignorable="d"
10-
Placement="Full"
11-
FlyoutPresenterStyle="{StaticResource RightDrawerFlyoutPresenterStyle}">
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5+
xmlns:local="using:Navigation.Presentation"
6+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7+
xmlns:uen="using:Uno.Extensions.Navigation.UI"
8+
xmlns:utu="using:Uno.Toolkit.UI"
9+
FlyoutPresenterStyle="{StaticResource RightDrawerFlyoutPresenterStyle}"
10+
Placement="Full"
11+
mc:Ignorable="d">
1212

13-
<StackPanel>
14-
<TextBlock Text="Flyout" />
15-
<Button Content="First Page"
16-
uen:Navigation.Request="First" />
17-
<Button Content="Second Page"
18-
uen:Navigation.Request="Second" />
19-
<Button Content="Third Page"
20-
uen:Navigation.Request="Third" />
21-
</StackPanel>
13+
<StackPanel>
14+
<TextBlock Text="Flyout" />
15+
<Button uen:Navigation.Request="First" Content="First Page" />
16+
<Button uen:Navigation.Request="Second" Content="Second Page" />
17+
<Button uen:Navigation.Request="Third" Content="Third Page" />
18+
</StackPanel>
2219
</Flyout>

‎UI/Navigation/src/Navigation/Presentation/FlyoutDrawer/SecondPage.xaml

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
11
<Page x:Class="Navigation.Presentation.SecondPage"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:local="using:Navigation.Presentation"
6-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:uen="using:Uno.Extensions.Navigation.UI"
8-
xmlns:utu="using:Uno.Toolkit.UI"
9-
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
10-
mc:Ignorable="d">
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5+
xmlns:local="using:Navigation.Presentation"
6+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7+
xmlns:uen="using:Uno.Extensions.Navigation.UI"
8+
xmlns:utu="using:Uno.Toolkit.UI"
9+
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
10+
mc:Ignorable="d">
1111

12-
<Grid utu:SafeArea.Insets="VisibleBounds">
13-
<Grid.RowDefinitions>
14-
<RowDefinition Height="Auto" />
15-
<RowDefinition />
16-
</Grid.RowDefinitions>
17-
<utu:NavigationBar Content="Second Page"
18-
Padding="60,0,0,0">
19-
<utu:NavigationBar.MainCommand>
20-
<AppBarButton>
21-
<AppBarButton.Icon>
22-
<BitmapIcon UriSource="ms-appx:///Assets/Images/back.png" />
23-
</AppBarButton.Icon>
24-
</AppBarButton>
25-
</utu:NavigationBar.MainCommand>
26-
</utu:NavigationBar>
27-
<StackPanel Grid.Row="1"
28-
HorizontalAlignment="Center"
29-
VerticalAlignment="Center"
30-
Spacing="16">
31-
<Image Width="150"
32-
Height="150"
33-
Margin="12"
34-
HorizontalAlignment="Center"
35-
Source="ms-appx:///Assets/logo.png" />
36-
<TextBlock Text="Second Page"
37-
HorizontalAlignment="Center"
38-
FontSize="40" />
39-
</StackPanel>
40-
</Grid>
12+
<Grid utu:SafeArea.Insets="VisibleBounds">
13+
<Grid.RowDefinitions>
14+
<RowDefinition Height="Auto" />
15+
<RowDefinition />
16+
</Grid.RowDefinitions>
17+
<utu:NavigationBar Padding="60,0,0,0" Content="Second Page">
18+
<utu:NavigationBar.MainCommand>
19+
<AppBarButton>
20+
<AppBarButton.Icon>
21+
<BitmapIcon UriSource="ms-appx:///Assets/Images/back.png" />
22+
</AppBarButton.Icon>
23+
</AppBarButton>
24+
</utu:NavigationBar.MainCommand>
25+
</utu:NavigationBar>
26+
<StackPanel Grid.Row="1"
27+
HorizontalAlignment="Center"
28+
VerticalAlignment="Center"
29+
Spacing="16">
30+
<Image Width="150"
31+
Height="150"
32+
Margin="12"
33+
HorizontalAlignment="Center"
34+
Source="ms-appx:///Assets/logo.png" />
35+
<TextBlock HorizontalAlignment="Center"
36+
FontSize="40"
37+
Text="Second Page" />
38+
</StackPanel>
39+
</Grid>
4140
</Page>

0 commit comments

Comments
 (0)