Skip to content

Commit 1c4db80

Browse files
vatsashah45vatsashah45
committed
fix: NavigationView for small screens
1 parent 7e5ebf3 commit 1c4db80

File tree

18 files changed

+58
-22
lines changed

18 files changed

+58
-22
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<RowDefinition Height="Auto" />
2020
<RowDefinition />
2121
</Grid.RowDefinitions>
22-
<utu:NavigationBar Padding="60,0,0,0" Content="Content Control Navigation" />
22+
<utu:NavigationBar Content="Content Control Navigation" />
2323

2424
<Grid Grid.Row="1">
2525
<Grid.ColumnDefinitions>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<RowDefinition Height="Auto" />
1515
<RowDefinition />
1616
</Grid.RowDefinitions>
17-
<utu:NavigationBar Padding="60,0,0,0" Content="First Page">
17+
<utu:NavigationBar Content="First Page">
1818
<utu:NavigationBar.MainCommand>
1919
<AppBarButton>
2020
<AppBarButton.Icon>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<RowDefinition Height="Auto" />
1616
<RowDefinition />
1717
</Grid.RowDefinitions>
18-
<utu:NavigationBar Padding="60,0,0,0" Content="Flyout Drawer Page" />
18+
<utu:NavigationBar Content="Flyout Drawer Page" />
1919

2020
<StackPanel Grid.Row="1"
2121
HorizontalAlignment="Center"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<RowDefinition Height="Auto" />
1515
<RowDefinition />
1616
</Grid.RowDefinitions>
17-
<utu:NavigationBar Padding="60,0,0,0" Content="Second Page">
17+
<utu:NavigationBar Content="Second Page">
1818
<utu:NavigationBar.MainCommand>
1919
<AppBarButton>
2020
<AppBarButton.Icon>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<RowDefinition Height="Auto" />
1515
<RowDefinition />
1616
</Grid.RowDefinitions>
17-
<utu:NavigationBar Padding="60,0,0,0" Content="Third Page">
17+
<utu:NavigationBar Content="Third Page">
1818
<utu:NavigationBar.MainCommand>
1919
<AppBarButton>
2020
<AppBarButton.Icon>

‎UI/Navigation/src/Navigation/Presentation/MainPage.xaml

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,45 @@
1010

1111
<Grid utu:SafeArea.Insets="VisibleBounds">
1212

13-
<muxc:NavigationView uen:Region.Attached="True"
13+
<Grid.RowDefinitions>
14+
<RowDefinition Height="Auto" />
15+
<RowDefinition Height="*" />
16+
</Grid.RowDefinitions>
17+
18+
<Grid.ColumnDefinitions>
19+
<ColumnDefinition Width="Auto" />
20+
<ColumnDefinition Width="*" />
21+
<ColumnDefinition Width="Auto" />
22+
</Grid.ColumnDefinitions>
23+
24+
<Button x:Name="NavViewToggleButton"
25+
Grid.Row="0"
26+
Grid.Column="0"
27+
HorizontalAlignment="Left"
28+
Click="NavViewToggleButton_Click"
29+
Canvas.ZIndex="10"
30+
Margin="10,0,0,0"
31+
Style="{StaticResource PaneToggleButtonStyle}" />
32+
33+
<TextBlock Text="Navigation Samples"
34+
Grid.Row="0"
35+
Grid.Column="1"
36+
HorizontalAlignment="Center"
37+
VerticalAlignment="Center"
38+
FontSize="24"
39+
FontWeight="Bold"
40+
Canvas.ZIndex="10"
41+
Margin="0,0,10,0" />
42+
43+
<muxc:NavigationView x:Name="NavigationViewControl"
44+
Grid.Row="1"
45+
Grid.ColumnSpan="3"
46+
uen:Region.Attached="True"
1447
IsBackButtonVisible="Collapsed"
1548
IsPaneOpen="True"
16-
IsSettingsVisible="False">
49+
IsSettingsVisible="False"
50+
IsPaneToggleButtonVisible="False">
51+
1752
<muxc:NavigationView.MenuItems>
1853

1954
<muxc:NavigationViewItem uen:Region.Name="./PageNavigation" Content="Page Navigation">

‎UI/Navigation/src/Navigation/Presentation/MainPage.xaml.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,9 @@ public MainPage()
66
{
77
this.InitializeComponent();
88
}
9+
10+
private void NavViewToggleButton_Click(object sender, RoutedEventArgs e)
11+
{
12+
NavigationViewControl.IsPaneOpen = !NavigationViewControl.IsPaneOpen;
13+
}
914
}

‎UI/Navigation/src/Navigation/Presentation/MessageDialog/MessageDialogPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<RowDefinition />
1616
</Grid.RowDefinitions>
1717

18-
<utu:NavigationBar Padding="60,0,0,0" Content="Message Dialog" />
18+
<utu:NavigationBar Content="Message Dialog" />
1919

2020
<TextBlock x:Name="MessageDialogResultText" Grid.Row="1" />
2121

‎UI/Navigation/src/Navigation/Presentation/ModalDialog/ComplexFlyoutPageOne.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
<RowDefinition Height="Auto" />
1616
<RowDefinition />
1717
</Grid.RowDefinitions>
18-
<utu:NavigationBar Padding="60,0,0,0"
19-
Background="{ThemeResource PrimaryBrush}"
18+
<utu:NavigationBar Background="{ThemeResource PrimaryBrush}"
2019
Content="Complex Flyout One"
2120
Foreground="{ThemeResource OnPrimaryBrush}">
2221
<utu:NavigationBar.MainCommand>

‎UI/Navigation/src/Navigation/Presentation/ModalDialog/ComplexFlyoutPageTwo.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
<RowDefinition Height="Auto" />
1616
<RowDefinition />
1717
</Grid.RowDefinitions>
18-
<utu:NavigationBar Padding="60,0,0,0"
19-
Background="{ThemeResource PrimaryBrush}"
18+
<utu:NavigationBar Background="{ThemeResource PrimaryBrush}"
2019
Content="Complex Flyout Two"
2120
Foreground="{ThemeResource OnPrimaryBrush}">
2221
<utu:NavigationBar.MainCommand>

0 commit comments

Comments
 (0)