From d4921a6db3424d569f7acd80a1cd767f27c82d78 Mon Sep 17 00:00:00 2001
From: Michael Gordeev <mikhailagord@gmail.com>
Date: Sun, 22 Apr 2018 14:36:25 +0300
Subject: [PATCH] Debugging

---
 FoxTube/About.xaml     | 11 ++++----
 FoxTube/Channel.xaml   |  6 +++++
 FoxTube/Feedback.xaml  |  2 +-
 FoxTube/MainPage.xaml  | 20 ++++++--------
 FoxTube/VideoCard.xaml | 60 ++++++++++++++++++++++--------------------
 5 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/FoxTube/About.xaml b/FoxTube/About.xaml
index 8b7616b..587c430 100644
--- a/FoxTube/About.xaml
+++ b/FoxTube/About.xaml
@@ -47,11 +47,12 @@
                     </StackPanel>
                     <TextBlock/>
                     <TextBlock Text="Legal stuff" FontSize="22" FontWeight="SemiBold"/>
-                    <HyperlinkButton Content="Our Privacy Policy" NavigateUri="http://foxgame.hol.es/foxtubepp.txt"/>
-                    <HyperlinkButton Content="Privacy Policy" NavigateUri="https://youtube.com/t/privacy"/>
-                    <HyperlinkButton Content="Terms of use" NavigateUri="https://youtube.com/t/terms"/>
-                    <HyperlinkButton Content="Community Guidelines" NavigateUri="https://youtube.com/t/community_guidelines"/>
-                    <TextBlock Text="Copyright © 2018 FoxGame Studio. All rights reserved."/>
+                    <HyperlinkButton Content="Our Privacy Policy" NavigateUri="http://foxgame.hol.es/foxtubepp.txt" Padding="0,5,0,0"/>
+                    <HyperlinkButton Content="Privacy Policy" NavigateUri="https://youtube.com/t/privacy" Padding="0"/>
+                    <HyperlinkButton Content="Terms of use" NavigateUri="https://youtube.com/t/terms" Padding="0"/>
+                    <HyperlinkButton Content="Community Guidelines" NavigateUri="https://youtube.com/t/community_guidelines" Padding="0,0,0,10"/>
+                    <TextBlock Text="© 2018 FoxGame Studio"/>
+                    <TextBlock Text="© 2018 YouTube, LLC"/>
                     <Image Source="Assets/FoxGame.png" Width="300" HorizontalAlignment="Left"/>
                 </StackPanel>
                 <Image Grid.Column="1" Source="Assets/LogoAvatar.png" VerticalAlignment="Top"/>
diff --git a/FoxTube/Channel.xaml b/FoxTube/Channel.xaml
index ef5c85d..befdf9d 100644
--- a/FoxTube/Channel.xaml
+++ b/FoxTube/Channel.xaml
@@ -11,6 +11,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="47"/>
             <RowDefinition Height="*"/>
+            <RowDefinition Height="75"/>
         </Grid.RowDefinitions>
         <Grid Grid.Row="0" Background="Red">
             <StackPanel Orientation="Horizontal">
@@ -28,5 +29,10 @@
             </StackPanel>
         </Grid>
         <Frame Grid.Row="1" Name="content"/>
+        <CommandBar Grid.Row="2" VerticalAlignment="Bottom">
+            <AppBarToggleButton Icon="Favorite" Label="Add to bookmarks"/>
+            <AppBarToggleButton Icon="Refresh" Label="Refresh"/>
+            <AppBarButton Icon="Flag" Label="Report" ToolTipService.ToolTip="Report this channel"/>
+        </CommandBar>
     </Grid>
 </Page>
diff --git a/FoxTube/Feedback.xaml b/FoxTube/Feedback.xaml
index 60d5120..2f115e4 100644
--- a/FoxTube/Feedback.xaml
+++ b/FoxTube/Feedback.xaml
@@ -25,7 +25,7 @@
                     <ColumnDefinition Width="30"/>
                 </Grid.ColumnDefinitions>
                 <TextBox Name="subject" Grid.Column="0" HorizontalAlignment="Stretch" GotFocus="subject_GotFocus" Header="Summarize your issue (max 400 characters)" MaxLength="400"/>
-                <TextBlock Name="subjectMissed" Grid.Column="1" FontFamily="Segoe MDL2 Assets" Text="&#xE814;" Foreground="Red" FontSize="30" Visibility="Collapsed"/>
+                <TextBlock Name="subjectMissed" Grid.Column="1" FontFamily="Segoe MDL2 Assets" Text="&#xE814;" Foreground="Red" FontSize="30" Visibility="Collapsed" VerticalAlignment="Bottom" Margin="1"/>
             </Grid>
             <TextBox Name="details" HorizontalAlignment="Stretch" Height="200" AcceptsReturn="True" ScrollViewer.VerticalScrollBarVisibility="Auto" MaxLength="1000" Margin="0,5,30,0" Header="Give us more detail (optional) (max 1000 characters)"/>
             <StackPanel Orientation="Horizontal" BorderBrush="Green" BorderThickness="5" Margin="0,10,30,0" Visibility="Collapsed" Name="greenResult">
diff --git a/FoxTube/MainPage.xaml b/FoxTube/MainPage.xaml
index 69ad584..c10dced 100644
--- a/FoxTube/MainPage.xaml
+++ b/FoxTube/MainPage.xaml
@@ -22,7 +22,6 @@
                 <ColumnDefinition Width="50"/>
                 <ColumnDefinition Width="50"/>
                 <ColumnDefinition Width="50"/>
-                <ColumnDefinition Width="50"/>
                 <ColumnDefinition Width="350"/>
             </Grid.ColumnDefinitions>
             <Button Name="menuButton" 
@@ -39,13 +38,10 @@
                         FontFamily="Segoe MDL2 Assets" Content="&#xE183;" Foreground="White"
                         Width="50" Height="50" Background="#00000000" RelativePanel.LeftOf="searchField"/>
             <Line Grid.Column="4" Y1="40" Y2="10" StrokeThickness="1" Stroke="White" HorizontalAlignment="Center"  Visibility="Collapsed"/>
-            <Button Name="refresh" Grid.Column="5" ToolTipService.ToolTip="Refresh" Click="refresh_Click"
-                        FontFamily="Segoe MDL2 Assets" Content="&#xE149;" Foreground="White"
-                        Width="50" Height="50" Background="#00000000" RelativePanel.LeftOf="searchField"/>
-            <Button Name="notificationMenu" Grid.Column="6" ToolTipService.ToolTip="Notifications" Click="notification_Click"
+            <Button Name="notificationMenu" Grid.Column="5" ToolTipService.ToolTip="Notifications" Click="notification_Click"
                         FontFamily="Segoe MDL2 Assets" Content="&#xED0D;" Foreground="White"
                         Width="50" Height="50" Background="#00000000" RelativePanel.LeftOf="searchField"/>
-            <Popup Grid.Column="6" Margin="0,50,0,0" Name="notificationPane" IsOpen="False" IsLightDismissEnabled="True">
+            <Popup Grid.Column="5" Margin="0,50,0,0" Name="notificationPane" IsOpen="False" IsLightDismissEnabled="True">
                 <StackPanel Width="350" Background="WhiteSmoke" Padding="0,10,0,0">
                     <TextBlock Text="Notifications" HorizontalAlignment="Center" FontWeight="Bold"/>
                     <StackPanel Margin="0,10,0,0">
@@ -59,10 +55,10 @@
                     </StackPanel>
                 </StackPanel>
             </Popup>
-            <Button Name="feddback" Grid.Column="7" ToolTipService.ToolTip="Send feedback" Click="feddback_Click"
+            <Button Name="feddback" Grid.Column="6" ToolTipService.ToolTip="Send feedback" Click="feddback_Click"
                         FontFamily="Segoe MDL2 Assets" Content="&#xED15;" Foreground="White"
                         Width="50" Height="50" Background="#00000000" RelativePanel.LeftOf="searchField"/>
-            <Button Name="account" Grid.Column="8" ToolTipService.ToolTip="Sign in"
+            <Button Name="account" Grid.Column="7" ToolTipService.ToolTip="Sign in"
                         FontFamily="Segoe MDL2 Assets" Content="&#xE8FA;" Foreground="White"
                         Width="50" Height="50" Background="#00000000" RelativePanel.LeftOf="searchField">
                 <Button.Flyout>
@@ -72,10 +68,10 @@
                     </MenuFlyout>
                 </Button.Flyout>
             </Button>
-            <Button Grid.Column="8" Padding="0" Width="50" Height="50" Visibility="Collapsed" Name="LoggedAvatar" Click="LoggedAvatar_Click">
+            <Button Grid.Column="7" Padding="0" Width="50" Height="50" Visibility="Collapsed" Name="LoggedAvatar" Click="LoggedAvatar_Click">
                 <PersonPicture Width="30"/>
             </Button>
-            <Popup Grid.Column="8" Margin="0,50,0,0" IsOpen="False" IsLightDismissEnabled="True" Name="AccountManagement">
+            <Popup Grid.Column="7" Margin="0,50,0,0" IsOpen="False" IsLightDismissEnabled="True" Name="AccountManagement">
                 <StackPanel Width="300" Background="WhiteSmoke">
                     <ListBox>
                         <ListBoxItem Height="75">
@@ -105,8 +101,8 @@
                     </ListBox>
                 </StackPanel>
             </Popup>
-            <TextBox Name="searchField" Grid.Column="9" ToolTipService.ToolTip="Search" Margin="4" Width="350" Height="50" Padding="14,10,5,0" PlaceholderText="Search" BorderThickness="0" Background="#7FFFFFFF" Text=""/>
-            <Button Name="searchButton" Grid.Column="9" HorizontalAlignment="Right"
+            <TextBox Name="searchField" Grid.Column="8" ToolTipService.ToolTip="Search" Margin="4" Width="350" Height="50" Padding="14,10,5,0" PlaceholderText="Search" BorderThickness="0" Background="#7FFFFFFF" Text=""/>
+            <Button Name="searchButton" Grid.Column="8" HorizontalAlignment="Right"
                         Width="42" Height="42" Margin="4"
                         RelativePanel.AlignRightWithPanel="True" 
                         Background="Transparent"
diff --git a/FoxTube/VideoCard.xaml b/FoxTube/VideoCard.xaml
index d90f0a5..9924e0d 100644
--- a/FoxTube/VideoCard.xaml
+++ b/FoxTube/VideoCard.xaml
@@ -7,39 +7,41 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
     d:DesignHeight="290"
-    d:DesignWidth="384">
+    d:DesignWidth="390">
 
-    <Grid Background="WhiteSmoke" BorderBrush="LightGray" BorderThickness="1" Width="384" Height="290" VerticalAlignment="Top">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="75"/>
-        </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" Background="Red" Padding="0,-35,0,0">
-            <Image Source="https://i.ytimg.com/vi/f8iOcZ43YT0/hqdefault.jpg"/>
-            <StackPanel Margin="0,-100,2,0" Background="WhiteSmoke" HorizontalAlignment="Right" Padding="5,0,3,0" Height="20">
-                <TextBlock Text="1:00:00" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="Gray" Margin="0,2,2,0" FontSize="12"/>
-            </StackPanel>
-        </StackPanel>
-        <Grid Grid.Row="1">
+    <Button Padding="0" Background="Transparent" VerticalAlignment="Top">
+        <Grid Background="WhiteSmoke" BorderBrush="LightGray" BorderThickness="1" Width="384" Height="290">
             <Grid.RowDefinitions>
-                <RowDefinition Height="20"/>
                 <RowDefinition Height="*"/>
+                <RowDefinition Height="75"/>
             </Grid.RowDefinitions>
-            <Grid Grid.Row="0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="75"/>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="160"/>
-                </Grid.ColumnDefinitions>
-                <Ellipse Grid.Column="0" Height="50" Width="50" Margin="10,-30,10,10" Fill="WhiteSmoke"/>
-                <PersonPicture Grid.Column="0" Height="46" Margin="10,-30,10,0" BorderBrush="White" BorderThickness="10" ProfilePicture="https://yt3.ggpht.com/-UOhOJaAitUc/AAAAAAAAAAI/AAAAAAAAAAA/z3WPfWpVuZw/s88-c-k-no-mo-rj-c0xffffff/photo.jpg"/>
-
-                <TextBlock Grid.Column="1" Text="IGP" Foreground="Gray" Margin="0,2,0,0" FontSize="12"/>
-                <TextBlock Grid.Column="2" Text="1M views | 59 minute ago" HorizontalAlignment="Right" Foreground="Gray" Margin="0,2,2,0" FontSize="12"/>
-            </Grid>
-            <StackPanel Grid.Row="1">
-                <TextBlock Text="Subnautica - SAY GOODBYE TO SUBNAUTICA! We're Back Home! - Subnautica Ending (Full Release Gameplay)" TextWrapping="WrapWholeWords" Margin="5" FontSize="14"/>
+            <StackPanel Grid.Row="0" Background="Red" Padding="0,-35,0,0">
+                <Image Source="https://i.ytimg.com/vi/f8iOcZ43YT0/hqdefault.jpg"/>
+                <StackPanel Margin="0,-100,2,0" Background="WhiteSmoke" HorizontalAlignment="Right" Padding="5,0,3,0" Height="20">
+                    <TextBlock Text="1:00:00" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="Gray" Margin="0,2,2,0" FontSize="12"/>
+                </StackPanel>
             </StackPanel>
+            <Grid Grid.Row="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="20"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+                <Grid Grid.Row="0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="75"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="160"/>
+                    </Grid.ColumnDefinitions>
+                    <Ellipse Grid.Column="0" Height="50" Width="50" Margin="10,-30,10,10" Fill="WhiteSmoke"/>
+                    <PersonPicture Grid.Column="0" Height="46" Margin="10,-30,10,0" BorderBrush="White" BorderThickness="10" ProfilePicture="https://yt3.ggpht.com/-UOhOJaAitUc/AAAAAAAAAAI/AAAAAAAAAAA/z3WPfWpVuZw/s88-c-k-no-mo-rj-c0xffffff/photo.jpg"/>
+
+                    <TextBlock Grid.Column="1" Text="IGP" Foreground="Gray" Margin="0,2,0,0" FontSize="12"/>
+                    <TextBlock Grid.Column="2" Text="1M views | 59 minute ago" HorizontalAlignment="Right" Foreground="Gray" Margin="0,2,2,0" FontSize="12"/>
+                </Grid>
+                <StackPanel Grid.Row="1">
+                    <TextBlock Text="Subnautica - SAY GOODBYE TO SUBNAUTICA! We're Back Home! - Subnautica Ending (Full Release Gameplay)" TextWrapping="WrapWholeWords" Margin="5" FontSize="14"/>
+                </StackPanel>
+            </Grid>
         </Grid>
-    </Grid>
+    </Button>
 </UserControl>