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
+51 -49
View File
@@ -34,67 +34,69 @@
<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">
<TextBlock IsTextSelectionEnabled="True" Name="title" Text="[Video title]" FontSize="25" TextWrapping="WrapWholeWords" HorizontalTextAlignment="Start"/> <StackPanel Margin="0,10">
<Grid> <TextBlock IsTextSelectionEnabled="True" Name="title" Text="[Video title]" FontSize="25" TextWrapping="WrapWholeWords" HorizontalTextAlignment="Start"/>
<Grid.RowDefinitions> <Grid>
<RowDefinition Height="Auto"/> <Grid.RowDefinitions>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
</Grid.RowDefinitions> <RowDefinition Height="Auto"/>
<Button Padding="0" Background="Transparent" Margin="5" Name="gotoChannel" Click="gotoChannel_Click"> </Grid.RowDefinitions>
<StackPanel Orientation="Horizontal"> <Button Padding="0" Background="Transparent" Margin="5" Name="gotoChannel" Click="gotoChannel_Click">
<PersonPicture Name="channelAvatar" Width="90"/> <StackPanel Orientation="Horizontal">
<StackPanel Orientation="Vertical" Grid.Column="1" Padding="5" VerticalAlignment="Center"> <PersonPicture Name="channelAvatar" Width="90"/>
<TextBlock Name="channelName" Text="[Channel name]" FontSize="18"/> <StackPanel Orientation="Vertical" Grid.Column="1" Padding="5" VerticalAlignment="Center">
<TextBlock Name="subscribers" Text="[subscribers]" Foreground="Gray" Margin="0,0,0,5"/> <TextBlock Name="channelName" Text="[Channel name]" FontSize="18"/>
<Button Click="subscribe_Click" Grid.Column="2" Height="30" Width="200" Background="Red" Foreground="White" FontSize="14" FontWeight="SemiBold" Content="Subscirbe" Name="subscribe"/> <TextBlock Name="subscribers" Text="[subscribers]" Foreground="Gray" Margin="0,0,0,5"/>
<Button Click="subscribe_Click" Grid.Column="2" Height="30" Width="200" Background="Red" Foreground="White" FontSize="14" FontWeight="SemiBold" Content="Subscirbe" Name="subscribe"/>
</StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </Button>
</Button> <StackPanel HorizontalAlignment="Stretch" Name="ratingPanel" Grid.Row="1">
<StackPanel HorizontalAlignment="Stretch" Name="ratingPanel" Grid.Row="1"> <TextBlock Name="views" Text="[views]" FontSize="24" Foreground="Gray"/>
<TextBlock Name="views" Text="[views]" FontSize="24" Foreground="Gray"/> <ProgressBar Name="rating" Background="Green" Foreground="Red"/>
<ProgressBar Name="rating" Background="Green" Foreground="Red"/> <Grid>
<Grid> <FontIcon Foreground="Gray"
<FontIcon Foreground="Gray"
HorizontalAlignment="Left" HorizontalAlignment="Left"
FontSize="40" FontSize="40"
Name="dislike" Tapped="dislike_Click" Name="dislike" Tapped="dislike_Click"
Glyph="&#xE19E;"/> Glyph="&#xE19E;"/>
<FontIcon Foreground="Gray" <FontIcon Foreground="Gray"
HorizontalAlignment="Right" HorizontalAlignment="Right"
FontSize="40" FontSize="40"
Name="like" Tapped="like_Click" Name="like" Tapped="like_Click"
Glyph="&#xE19F;"/> Glyph="&#xE19F;"/>
</Grid> </Grid>
<Grid> <Grid>
<TextBlock Foreground="Gray" Text="[dislikes]" Name="dislikes"/> <TextBlock Foreground="Gray" Text="[dislikes]" Name="dislikes"/>
<TextBlock HorizontalAlignment="Right" Foreground="Gray" Text="[likes]" Name="likes"/> <TextBlock HorizontalAlignment="Right" Foreground="Gray" Text="[likes]" Name="likes"/>
</Grid> </Grid>
</StackPanel> </StackPanel>
</Grid> </Grid>
<TextBlock Name="description" Text="[Description]" IsTextSelectionEnabled="True" TextWrapping="WrapWholeWords"/> <TextBlock Name="description" Text="[Description]" IsTextSelectionEnabled="True" TextWrapping="WrapWholeWords"/>
<Grid Margin="0,20,0,0"> <Grid Margin="0,20,0,0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
<ColumnDefinition Width="20"/> <ColumnDefinition Width="20"/>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Text="Published at: "/> <TextBlock Text="Published at: "/>
<TextBlock Grid.Row="1" Text="Category: "/> <TextBlock Grid.Row="1" Text="Category: "/>
<TextBlock Grid.Row="2" Text="License: "/> <TextBlock Grid.Row="2" Text="License: "/>
<TextBlock Name="publishedAt" Grid.Column="2" Text="[Publishing date]"/> <TextBlock Name="publishedAt" Grid.Column="2" Text="[Publishing date]"/>
<TextBlock Name="category" Grid.Column="2" Grid.Row="1" Padding="0" Text="[Category]"/> <TextBlock Name="category" Grid.Column="2" Grid.Row="1" Padding="0" Text="[Category]"/>
<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
+17 -30
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,39 +356,30 @@ 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);
{ tabsPlaceholder.Children.Add(pivot);
mainContent.Children.Remove(pivot);
tabsPlaceholder.Children.Add(pivot); pivot.Items.RemoveAt(0);
mainContent.Children.Add(descriptionPanel);
(pivot.Items[0] as PivotItem).Content = null;
pivot.Items.RemoveAt(0);
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);
{ pivot.Items.Insert(0, descriptionPanel);
mainContent.Children.Remove(descriptionPanel);
pivot.Items.Insert(0, new PivotItem() tabsPlaceholder.Children.Remove(pivot);
{ mainContent.Children.Add(pivot);
Content = descriptionPanel,
Header = "Description"
});
tabsPlaceholder.Children.Remove(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)