From cd6f65ffe076618cd1de5bbfc8892055f5ac4300 Mon Sep 17 00:00:00 2001
From: Michael Gordeev <mikhailagord@gmail.com>
Date: Wed, 18 Apr 2018 22:13:56 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1ommon=20improvements?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FoxTube/Feedback.xaml      |   2 +-
 FoxTube/MainPage.xaml      |   2 +-
 FoxTube/MainPage.xaml.cs   |   5 ++++-
 FoxTube/VideoCard.xaml     |   2 +-
 FoxTube/VideoGrid.xaml     |  13 +++++++------
 Src/FoxTubeLogoIcon120.png | Bin 0 -> 1825 bytes
 6 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 Src/FoxTubeLogoIcon120.png

diff --git a/FoxTube/Feedback.xaml b/FoxTube/Feedback.xaml
index 6af3dff..7b64e65 100644
--- a/FoxTube/Feedback.xaml
+++ b/FoxTube/Feedback.xaml
@@ -17,7 +17,7 @@
             </StackPanel>
             <TextBlock Text="Tell us about it" FontSize="18" Margin="0,10,0,0"/>
             <TextBlock Text="Summarize your issue" Margin="0,10,0,0"/>
-            <TextBox Width="1000" HorizontalAlignment="Left"/>
+            <TextBox Width="1000" MaxWidth="1000" HorizontalAlignment="Left"/>
             <TextBlock Text="Give us more detail (optional)" Margin="0,10,0,0"/>
             <TextBox Width="1000" HorizontalAlignment="Left" Height="200"/>
             <Button Content="Submit feedback"  Margin="0,10,0,0"/>
diff --git a/FoxTube/MainPage.xaml b/FoxTube/MainPage.xaml
index f212191..52d49f4 100644
--- a/FoxTube/MainPage.xaml
+++ b/FoxTube/MainPage.xaml
@@ -31,7 +31,7 @@
                     Grid.Column="0"
                     Click="menuButton_Click"
                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
-            <TextBlock Grid.Column="1" Text="Home" FontSize="20" FontWeight="Bold" Margin="5, 0, 0, 0"  HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"/>
+            <TextBlock Grid.Column="1" Text="Home" FontSize="20" FontWeight="Bold" Margin="5, 0, 0, 0"  HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White" Name="headerText"/>
             <Button Name="goLive" Grid.Column="2" ToolTipService.ToolTip="Go to Live!" Visibility="Collapsed"
                         FontFamily="Segoe MDL2 Assets" Content="&#xF081;" Foreground="White"
                         Width="50" Height="50" Background="#00000000" RelativePanel.LeftOf="searchField"/>
diff --git a/FoxTube/MainPage.xaml.cs b/FoxTube/MainPage.xaml.cs
index aa9493e..2a55ecf 100644
--- a/FoxTube/MainPage.xaml.cs
+++ b/FoxTube/MainPage.xaml.cs
@@ -184,24 +184,27 @@ namespace FoxTube
             if(topHamburger.SelectedIndex == 0)
             {
                 content.Navigate(typeof(Home));
+                headerText.Text = "Home";
                 menu.DisplayMode = SplitViewDisplayMode.CompactInline;
                 menu.IsPaneOpen = true;
             }
             else if (bottomHaburger.SelectedIndex == 3)
             {
                 content.Navigate(typeof(Settings));
+                headerText.Text = "Settings";
                 menu.DisplayMode = SplitViewDisplayMode.CompactOverlay;
                 menu.IsPaneOpen = false;
             }
             else if (bottomHaburger.SelectedIndex == 0)
             {
                 content.Navigate(typeof(Channel));
+                headerText.Text = "Channel overview";
                 menu.DisplayMode = SplitViewDisplayMode.CompactOverlay;
                 menu.IsPaneOpen = false;
             }
             else if (bottomHaburger.SelectedIndex == 2)
             {
-                bottomHaburger.SelectedItem = null;
+                topHamburger.SelectedIndex = 0;
             }
         }
 
diff --git a/FoxTube/VideoCard.xaml b/FoxTube/VideoCard.xaml
index 64fcab8..d90f0a5 100644
--- a/FoxTube/VideoCard.xaml
+++ b/FoxTube/VideoCard.xaml
@@ -9,7 +9,7 @@
     d:DesignHeight="290"
     d:DesignWidth="384">
 
-    <Grid Background="WhiteSmoke">
+    <Grid Background="WhiteSmoke" BorderBrush="LightGray" BorderThickness="1" Width="384" Height="290" VerticalAlignment="Top">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
             <RowDefinition Height="75"/>
diff --git a/FoxTube/VideoGrid.xaml b/FoxTube/VideoGrid.xaml
index a6b97d6..34ad9bc 100644
--- a/FoxTube/VideoGrid.xaml
+++ b/FoxTube/VideoGrid.xaml
@@ -7,13 +7,14 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Padding="5">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="384"/>
-            <ColumnDefinition Width="384"/>
-            <ColumnDefinition Width="384"/>
-            <ColumnDefinition Width="384"/>
-            <ColumnDefinition Width="384"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
+        <local:VideoCard/>
     </Grid>
 </Page>
diff --git a/Src/FoxTubeLogoIcon120.png b/Src/FoxTubeLogoIcon120.png
new file mode 100644
index 0000000000000000000000000000000000000000..49ddb0ec5488e97b93e96bfd156c52ffe6b36997
GIT binary patch
literal 1825
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
D_}p=g

literal 0
HcmV?d00001