Cleanup

FoxTube/Assets/Data/RevEn.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<items>
-  <item time="2019-02-02" version="0.3">
-    <content>
-      <en-US>### What's new:
-
-- Small fixes
-- First public pre-release version
-- Some content was cut out due to its incompleteness
-      </en-US>
-      <ru-RU>### Что нового:
-
-- Мелкие исправления багов
-- Эта версия является первой пред-релизной публичной версией
-- Некотроые функции были вырезаны из-за их незавершенности
-      </ru-RU>
-    </content>
-  </item>
-  <item time="2019-01-05" version="0.2.19012">
-    <content>
-      <en-US>### What's new:
-
-- 'Live' button fixed in the player
-- Long channel names on crads fixed
-- Fixed video description disappearing on window resizing
-- Player seek is fixed
-- Added video buffering progress indicatior
-- Small fixes
-
-### Known issues:
-
-- Recommended and subscriptions pages aren't implemented
-- History isn't implemented
-- Playlists management isn't implemented
-- Ads aren't implemented
-      </en-US>
-      <ru-RU>### Что нового:
-
-- Кнопка перехода к прямому эфиру на стримах теперь работает
-- Исправлен баг с длинными именами каналов на карточках
-- Исправлено исчезание описания видео при изменении размеров окна
-- Исправлен ползунок перемотки видео
-- Добавлен индикатор буферизации видео
-- Мелкие исправления
-
-### Что по-прежнему не работает:
-
-- Страница рекомендованных видео и страница видео с подписок
-- История
-- Работа с плейлистами
-- Нет карточек рекламы
-      </ru-RU>
-    </content>
-  </item>
-</items>

FoxTube/Controls/Advert.xaml

@@ -1,17 +0,0 @@
-<UserControl
-    x:Class="FoxTube.Controls.Advert"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:ad="using:Microsoft.Advertising.WinRT.UI"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
-
-    <Grid Name="grid" SizeChanged="Grid_SizeChanged">
-        <ad:AdControl VerticalAlignment="Top"
-            Name="ad" ApplicationId="{x:Bind AppId}"
-            AdUnitId="{x:Bind AdUnitId}"
-            Height="50"
-            Width="300"/>
-    </Grid>
-</UserControl>

FoxTube/Controls/Advert.xaml.cs

@@ -1,69 +0,0 @@
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace FoxTube.Controls
-{
-    public sealed partial class Advert : UserControl
-    {
-        public string AdUnitId { get; set; } = "test";
-        public string AppId => "3f83fe91-d6be-434d-a0ae-7351c5a997f1";
-        public bool OverrideSize { get; set; } = false;
-
-        public new double Height
-        {
-            get { return ad.Height; }
-            set
-            {
-                ad.Height = value;
-                OverrideSize = true;
-            }
-        }
-
-        public new double Width
-        {
-            get { return ad.Width; }
-            set
-            {
-                ad.Width = value;
-                OverrideSize = true;
-            }
-        }
-
-        public Advert()
-        {
-            InitializeComponent();
-            if (!SecretsVault.AdsDisabled)
-                Visibility = Visibility.Visible;
-            else
-                Visibility = Visibility.Collapsed;
-            SecretsVault.Purchased += (s, e) => Visibility = (bool)e[0] ? Visibility.Collapsed : Visibility.Visible;
-        }
-
-        private void Grid_SizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            if (OverrideSize)
-                return;
-
-            if(grid.ActualWidth >= 728)
-            {
-                ad.Width = 728;
-                ad.Height = 90;
-            }
-            else if (grid.ActualWidth >= 640)
-            {
-                ad.Width = 640;
-                ad.Height = 100;
-            }
-            else if (grid.ActualWidth >= 320)
-            {
-                ad.Width = 320;
-                ad.Height = 50;
-            }
-            else
-            {
-                ad.Width = 300;
-                ad.Height = 50;
-            }
-        }
-    }
-}

FoxTube/Controls/PlaylistCard.xaml

@@ -1,4 +1,4 @@
-<Page
+<UserControl
     x:Class="FoxTube.Controls.PlaylistCard"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -69,4 +69,4 @@
             <MenuFlyoutItem x:Uid="/Cards/share" Icon="Share" Text="Share" Name="share" Visibility="Collapsed"/>
         </MenuFlyout>
     </UserControl.ContextFlyout>
-</Page>
+</UserControl>

FoxTube/Controls/PlaylistCard.xaml.cs

@@ -16,7 +16,7 @@ namespace FoxTube.Controls
     /// <summary>
     /// Playlist card control
     /// </summary>
-    public sealed partial class PlaylistCard : Page
+    public sealed partial class PlaylistCard : UserControl
     {
         Playlist item;
         public string playlistId;

FoxTube/FoxTube.csproj

@@ -110,9 +110,6 @@
     <Compile Include="Classes\SearchParameters.cs" />
     <Compile Include="Classes\SettingsStorage.cs" />
     <Compile Include="Classes\ManifestGenerator.cs" />
-    <Compile Include="Controls\Advert.xaml.cs">
-      <DependentUpon>Advert.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Controls\Adverts\CardAdvert.xaml.cs">
       <DependentUpon>CardAdvert.xaml</DependentUpon>
     </Compile>
@@ -227,7 +224,6 @@
     <Content Include="Assets\BadgeLogo.scale-200.png" />
     <Content Include="Assets\BadgeLogo.scale-400.png" />
     <Content Include="Assets\ChannelCoverTemplate.png" />
-    <Content Include="Assets\Data\RevEn.xml" />
     <Content Include="Assets\Data\Patchnotes.xml" />
     <Content Include="Assets\FoxGame.png" />
     <Content Include="Assets\Icons\Profile.png" />
@@ -297,10 +293,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="Controls\Advert.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Controls\Adverts\CardAdvert.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>