archive/FoxTube
Archived
1
0
Fork 0
Code Actions Activity

New pages: settings, channel

Browse Source
This commit is contained in:
Michael Gordeev
2018-04-14 20:51:07 +03:00
parent 583bc8fc9b
commit 3d0cb26518
11 changed files with 204 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FoxTube/Assets/ChannelCoverTemplate.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 121 KiB

FoxTube/Channel.xaml
+53
View File
@@ -0,0 +1,53 @@
<Page
x:Class="FoxTube.Channel"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:FoxTube"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Grid.RowDefinitions>
<RowDefinition Height="47"/>
<RowDefinition MinHeight="50" MaxHeight="310"/>
<RowDefinition Height="75"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Grid Grid.Row="0" Background="Red">
<StackPanel Orientation="Horizontal">
<HyperlinkButton Content="Videos" Foreground="White" Margin="10,8,10,10"/>
<HyperlinkButton Content="Playlists" Foreground="White" Margin="10,8,10,10"/>
<HyperlinkButton Content="Community" Foreground="White" Margin="10,8,10,10"/>
<HyperlinkButton Content="Channels" Foreground="White" Margin="10,8,10,10"/>
<HyperlinkButton Content="About channel" Foreground="White" FontStyle="Normal" Margin="10,8,10,10"/>
</StackPanel>
</Grid>
<Image Grid.Row="1" Name="ChannelCover" Width="1920" Source="Assets/ChannelCoverTemplate.png"/>
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="250"/>
<ColumnDefinition Width="50"/>
</Grid.ColumnDefinitions>
<PersonPicture Grid.Column="0" HorizontalAlignment="Left" Margin="10,-30,0,0"/>
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="10,0,0,0">
<TextBlock FontWeight="SemiBold" FontSize="22" Text="Channel name"/>
<TextBlock Foreground="Gray" Text="1 000 000 subscribers"/>
</StackPanel>
<Button Grid.Column="2" Height="50" Width="250" Background="Red" Foreground="White" FontSize="18" FontWeight="SemiBold" Content="Subscirbe"/>
<Button Grid.Column="3" Height="50" Width="50" FontFamily="Segoe MDL2 Asset" Content=""/>
</Grid>
<!--<StackPanel Grid.Row="2" Orientation="Horizontal">
<PersonPicture HorizontalAlignment="Left" Margin="10,-30,0,0"/>
<StackPanel Orientation="Vertical" Margin="10,0,0,0">
<TextBlock FontWeight="SemiBold" FontSize="22" Text="Channel name"/>
<TextBlock Foreground="Gray" Text="1 000 000 subscribers"/>
</StackPanel>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
<Button Content="Subscirbe"/>
</StackPanel>
</StackPanel>-->
</Grid>
</Page>
FoxTube/Channel.xaml.cs
+30
View File
@@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime;
using Windows.Foundation;
using Windows.Foundation.Collections;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Controls.Primitives;
using Windows.UI.Xaml.Data;
using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Navigation;
// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
namespace FoxTube
{
/// <summary>
/// An empty page that can be used on its own or navigated to within a Frame.
/// </summary>
public sealed partial class Channel : Page
{
public Channel()
{
this.InitializeComponent();
}
}
}
FoxTube/Feedback.xaml
+26
View File
@@ -0,0 +1,26 @@
<Page
x:Class="FoxTube.Feedback"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:FoxTube"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<StackPanel Orientation="Vertical" Margin="10">
<TextBlock Text="Feedback Hub" FontSize="28"/>
<TextBlock Text="What kind of feedback is it?" FontSize="18" Margin="0,10,0,0"/>
<StackPanel Orientation="Horizontal">
<RadioButton Content="Suggestion"/>
<RadioButton Content="Problem"/>
</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"/>
<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"/>
</StackPanel>
</Grid>
</Page>
FoxTube/Feedback.xaml.cs
+30
View File
@@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime;
using Windows.Foundation;
using Windows.Foundation.Collections;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Controls.Primitives;
using Windows.UI.Xaml.Data;
using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Navigation;
// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
namespace FoxTube
{
/// <summary>
/// An empty page that can be used on its own or navigated to within a Frame.
/// </summary>
public sealed partial class Feedback : Page
{
public Feedback()
{
this.InitializeComponent();
}
}
}
FoxTube/FoxTube.csproj
+15
View File
@@ -98,6 +98,12 @@
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
</Compile>
<Compile Include="Channel.xaml.cs">
<DependentUpon>Channel.xaml</DependentUpon>
</Compile>
<Compile Include="Feedback.xaml.cs">
<DependentUpon>Feedback.xaml</DependentUpon>
</Compile>
<Compile Include="General.xaml.cs">
<DependentUpon>General.xaml</DependentUpon>
</Compile>
@@ -124,6 +130,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="Assets\AnnouncementThumb.png" />
<Content Include="Assets\ChannelCoverTemplate.png" />
<Content Include="Assets\FoxGame.png" />
<Content Include="Assets\LargeTile.scale-100.png" />
<Content Include="Assets\LargeTile.scale-125.png" />
@@ -185,6 +192,14 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Channel.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Feedback.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="General.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
FoxTube/MainPage.xaml
+1 -1
View File
@@ -75,7 +75,7 @@
</StackPanel>
</StackPanel>
</Popup>
<Button Name="feddback" Grid.Column="7" ToolTipService.ToolTip="Send feedback"
<Button Name="feddback" Grid.Column="7" 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"
FoxTube/MainPage.xaml.cs
+39 -1
View File
@@ -182,6 +182,7 @@ namespace FoxTube
{
if(topHamburger.SelectedItem != null)
bottomHaburger.SelectedItem = null;
MenuSelectionChanged();
} catch { }
}
@@ -191,9 +192,38 @@ namespace FoxTube
{
if(bottomHaburger.SelectedItem != null)
topHamburger.SelectedItem = null;
MenuSelectionChanged();
} catch { }
}
private void MenuSelectionChanged()
{
if(topHamburger.SelectedIndex == 0)
{
content.Navigate(typeof(About));
menu.DisplayMode = SplitViewDisplayMode.CompactInline;
menu.IsPaneOpen = true;
subsMenuTitle.Visibility = Visibility.Visible;
subsMenuStroke.X2 = 165;
subsMenuStroke.Y1 = subsMenuStroke.Y2 = 10;
subscriptionsTitle.Height = 17;
subsLogErr.Visibility = Visibility.Visible;
}
else if (bottomHaburger.SelectedIndex == 3)
{
content.Navigate(typeof(Settings));
menu.DisplayMode = SplitViewDisplayMode.CompactOverlay;
menu.IsPaneOpen = false;
subsMenuTitle.Visibility = Visibility.Collapsed;
subsMenuStroke.X2 = 40;
subsMenuStroke.Y1 = subsMenuStroke.Y2 = 0;
subscriptionsTitle.Height = 2;
subsLogErr.Visibility = Visibility.Collapsed;
}
}
private void notification_Click(object sender, RoutedEventArgs e)
{
notificationPane.IsOpen = !notificationPane.IsOpen;
@@ -211,7 +241,15 @@ namespace FoxTube
private void refresh_Click(object sender, RoutedEventArgs e)
{
content.UpdateLayout();
Type t = content.CurrentSourcePageType;
content.Navigate(t);
}
private void feddback_Click(object sender, RoutedEventArgs e)
{
bottomHaburger.SelectedIndex = 3;
Settings s = content.Content as Settings;
s.content.Navigate(typeof(Feedback));
}
}
}
FoxTube/Settings.xaml
+7 -7
View File
@@ -9,20 +9,20 @@
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Grid.RowDefinitions>
<!--<RowDefinition Height="47"/>-->
<RowDefinition Height="47"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Grid Grid.Row="0" Background="Red" Visibility="Collapsed">
<Grid Grid.Row="0" Background="Red">
<StackPanel Orientation="Horizontal">
<HyperlinkButton Content="General" Foreground="White" Margin="10,8,10,10" Name="GeneralMenu" Click="General_Click"/>
<HyperlinkButton Content="Personalization" Foreground="White" Margin="10,8,10,10" Name="PersonalizationMenu" Click="Personalization_Click"/>
<HyperlinkButton Content="Account" Foreground="White" Margin="10,8,10,10" Name="AccountMenu" Click="Account_Click"/>
<HyperlinkButton Content="Personalization" Foreground="White" Margin="10,8,10,10" Name="PersonalizationMenu" Click="Personalization_Click" Visibility="Collapsed"/>
<HyperlinkButton Content="Account" Foreground="White" Margin="10,8,10,10" Name="AccountMenu" Click="Account_Click" Visibility="Collapsed"/>
<HyperlinkButton Content="Leave feedback" Foreground="White" Margin="10,8,10,10" Name="FeedbackMenu" Click="Feedback_Click"/>
<HyperlinkButton Content="About us" Foreground="White" FontStyle="Normal" Margin="10,8,10,10" Name="AboutMenu" Click="About_Click"/>
<HyperlinkButton Content="Join beta program" Foreground="White" Margin="10,8,10,10" Name="BetaMenu" Click="Beta_Click"/>
<HyperlinkButton Content="Help us translate this app" Foreground="White" Margin="10,8,10,10" Name="TranslateMenu" Click="Translate_Click"/>
<HyperlinkButton Content="Join beta program" Foreground="White" Margin="10,8,10,10" Name="BetaMenu" Click="Beta_Click" Visibility="Collapsed"/>
<HyperlinkButton Content="Help us translate this app" Foreground="White" Margin="10,8,10,10" Name="TranslateMenu" Click="Translate_Click" Visibility="Collapsed"/>
</StackPanel>
</Grid>
<Frame Grid.Row="1" Name="settingsContent"/>
<Frame Grid.Row="1" Name="settingsContent" />
</Grid>
</Page>
FoxTube/Settings.xaml.cs
+3 -1
View File
@@ -22,10 +22,12 @@ namespace FoxTube
/// </summary>
public sealed partial class Settings : Page
{
public Frame content;
public Settings()
{
this.InitializeComponent();
settingsContent.Navigate(typeof(General));
content = settingsContent;
}
private void General_Click(object sender, RoutedEventArgs e)
@@ -60,7 +62,7 @@ namespace FoxTube
private void Feedback_Click(object sender, RoutedEventArgs e)
{
settingsContent.Navigate(typeof(Feedback));
}
}
}