archive/FoxTube
Archived
1
0
Fork 0
Code Actions Activity

#204: Fixed

Browse Source
This commit is contained in:
Michael Gordeev
2018-10-10 20:29:32 +03:00
parent ced1588c54
commit 73c4bbf360
3 changed files with 69 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FoxTube/Pages/MainPage.xaml
+1 -4
View File
@@ -24,17 +24,14 @@
<VisualState.Setters> <VisualState.Setters>
<Setter Target="header.FontSize" Value="28"/> <Setter Target="header.FontSize" Value="28"/>
<Setter Target="headerGrid.Margin" Value="10,25,0,0"/> <Setter Target="headerGrid.Margin" Value="10,25,0,0"/>
<Setter Target="nav.Margin" Value="0"/>
<Setter Target="account.Height" Value="50"/> <Setter Target="account.Height" Value="50"/>
<Setter Target="notificationMenu.Height" Value="50"/> <Setter Target="notificationMenu.Height" Value="50"/>
<Setter Target="avatar.Height" Value="50"/> <Setter Target="avatar.Height" Value="50"/>
<Setter Target="AppTitle.Visibility" Value="Collapsed"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
</VisualStateManager.VisualStateGroups> </VisualStateManager.VisualStateGroups>
<TextBlock x:Name="AppTitle" Style="{StaticResource CaptionTextBlockStyle}" Text="FoxTube" Margin="12,8"/> <NavigationView SelectedItem="toHome" Windows10version1803:BackRequested="nav_BackRequested" Windows10version1803:PaneTitle="FoxTube" OpenPaneLength="300" Name="nav" SelectionChanged="nav_SelectionChanged">
<NavigationView Margin="0,30,0,0" SelectedItem="toHome" Windows10version1803:BackRequested="nav_BackRequested" Windows10version1803:PaneTitle="FoxTube" OpenPaneLength="300" Name="nav" SelectionChanged="nav_SelectionChanged">
<NavigationView.MenuItems> <NavigationView.MenuItems>
<NavigationViewItem x:Uid="/Main/home" Icon="Home" Content="Home" Name="toHome"/> <NavigationViewItem x:Uid="/Main/home" Icon="Home" Content="Home" Name="toHome"/>
FoxTube/Pages/VideoPage.xaml
+3 -1
View File
@@ -34,7 +34,8 @@
<ScrollViewer Margin="0,0,0,50" Name="mainScroll"> <ScrollViewer Margin="0,0,0,50" Name="mainScroll">
<StackPanel Orientation="Vertical" Name="mainContent"> <StackPanel Orientation="Vertical" Name="mainContent">
<local:VideoPlayer/> <local:VideoPlayer/>
<StackPanel Margin="10" Name="descriptionPanel"> <PivotItem Header="Description" Name="descriptionPanel">
<StackPanel Margin="0,10">
<TextBlock IsTextSelectionEnabled="True" Name="title" Text="[Video title]" FontSize="25" TextWrapping="WrapWholeWords" HorizontalTextAlignment="Start"/> <TextBlock IsTextSelectionEnabled="True" Name="title" Text="[Video title]" FontSize="25" TextWrapping="WrapWholeWords" HorizontalTextAlignment="Start"/>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@@ -95,6 +96,7 @@
<TextBlock Name="license" Grid.Column="2" Grid.Row="2" Text="[License type]"/> <TextBlock Name="license" Grid.Column="2" Grid.Row="2" Text="[License type]"/>
</Grid> </Grid>
</StackPanel> </StackPanel>
</PivotItem>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
FoxTube/Pages/VideoPage.xaml.cs
+7 -20
View File
@@ -92,11 +92,7 @@ namespace FoxTube.Pages
{ {
Debug.WriteLine("Correcting layout..."); Debug.WriteLine("Correcting layout...");
mainContent.Children.Remove(descriptionPanel); mainContent.Children.Remove(descriptionPanel);
pivot.Items.Insert(0, new PivotItem() pivot.Items.Insert(0, descriptionPanel);
{
Content = descriptionPanel,
Header = "Description"
});
tabsPlaceholder.Children.Remove(pivot); tabsPlaceholder.Children.Remove(pivot);
mainContent.Children.Add(pivot); mainContent.Children.Add(pivot);
@@ -360,40 +356,31 @@ namespace FoxTube.Pages
else else
wide = false; wide = false;
if (e.NewSize.Width > 1000 && e.PreviousSize.Width <= 1000 && !isExtended) if (e.NewSize.Width > 1000 && mainContent.Children.Contains(pivot) && !isExtended)
{
if (mainContent.Children.Contains(pivot))
{ {
mainContent.Children.Remove(pivot); mainContent.Children.Remove(pivot);
tabsPlaceholder.Children.Add(pivot); tabsPlaceholder.Children.Add(pivot);
(pivot.Items[0] as PivotItem).Content = null;
pivot.Items.RemoveAt(0); pivot.Items.RemoveAt(0);
mainContent.Children.Add(descriptionPanel); mainContent.Children.Add(descriptionPanel);
}
grid.ColumnDefinitions[1].Width = new GridLength(400); grid.ColumnDefinitions[1].Width = new GridLength(400);
pivot.SelectedIndex = 0;
} }
else if (e.NewSize.Width <= 1000 & e.PreviousSize.Width > 1000) else if (e.NewSize.Width <= 1000 && mainContent.Children.Contains(descriptionPanel))
{
if (mainContent.Children.Contains(descriptionPanel))
{ {
mainContent.Children.Remove(descriptionPanel); mainContent.Children.Remove(descriptionPanel);
pivot.Items.Insert(0, new PivotItem() pivot.Items.Insert(0, descriptionPanel);
{
Content = descriptionPanel,
Header = "Description"
});
tabsPlaceholder.Children.Remove(pivot); tabsPlaceholder.Children.Remove(pivot);
mainContent.Children.Add(pivot); mainContent.Children.Add(pivot);
}
grid.ColumnDefinitions[1].Width = new GridLength(0); grid.ColumnDefinitions[1].Width = new GridLength(0);
}
pivot.SelectedIndex = 0; pivot.SelectedIndex = 0;
} }
}
private async void Share(DataTransferManager sender, DataRequestedEventArgs args) private async void Share(DataTransferManager sender, DataRequestedEventArgs args)
{ {