- Fixed dev messages inbox

- Activated live ads - Updated version to 1.0 - Added play/pause on player click - Added player hotkeys
2019-05-31 19:38:51 +03:00
parent 0c26bb7700
commit d0fa87b3ab
7 changed files with 63 additions and 14 deletions
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <items>
-  <item time="2019-05-21" version="0.6.2">
+  <item time="2019-05-21" version="1.0">
    <content>
-      <en-US>##[Patch #1]
+      <en-US>##[Final release]
 ### What's new:
 - In-video advert now doesn't appear on minimized playback
 - Fixed small header appearing on channel page
@@ -12,8 +12,14 @@
 - Added backward navigation to video page
 - Improved authentication process
 - Removed outdated logo from 'About' page and updated Twitter link
+- Play/pause toggle on video player mouse click
+- Added player hotkeys:
+    Space - Play/Pause
+    Arrow right/left - Skip forward/backward
+    F11 - Toggle full screen
+- Activated real ads
      </en-US>
-      <ru-RU>##[Патч #1]
+      <ru-RU>##[Релизная версия]
 ### Что нового:
 - Теперь реклама в видео не появляется в компактном режиме
 - Исправлено появление меленького заголовка на странице канала
@@ -23,6 +29,12 @@
 - Добавлена обратная навигация для страниц просмотра
 - Улучшен процесс аутентификации
 - Удален старый логотип с страницы 'О приложении' и обновлена ссылка на Твиттер
+- Пауза/воспроизведение при клике мышью по окну плеера
+- Добавлены горячие клавиши:
+    Пробел - Пауза/Воспроизведение
+    Стрелка вправо/влево - Перейти вперед на 30 секунд/назад на 10 секунд
+    F11 - Переключить полноэкранный режим
+- Запущена реальная реклама
      </ru-RU>
    </content>
  </item>
@@ -44,7 +44,7 @@ namespace FoxTube
        public static YouTubeService Service => IsAuthorized ? new YouTubeService(Initializer) : NoAuthService;

        public static HttpClient HttpClient { get; } = new HttpClient();
-        private static bool TestAds => true;   //TODO: Change this bool
+        private static bool TestAds => false;   //TODO: Change this bool
        public static string AppId => TestAds ? "d25517cb-12d4-4699-8bdc-52040c712cab" : "9ncqqxjtdlfh";
        public static string AdUnitId => TestAds ? "test" : "1100044398";
        public static bool AdsDisabled { get; private set; } = true;
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using Windows.ApplicationModel.Resources;
+using Windows.Foundation;
 using Windows.Graphics.Display;
 using Windows.Media.Core;
 using Windows.UI.Xaml;
@@ -69,8 +70,6 @@ namespace FoxTube
        Button fwd;
        Button bwd;
        Button captionsMenu;
-        Button settingsMenu;
-        Button fullscreen;
        Button drag;

        TextBlock title;
@@ -94,6 +93,7 @@ namespace FoxTube
        Grid header;
        Grid footer;
        Grid center;
+        Grid centerTrigger;
        #endregion

        PlayerDisplayState State { get; set; } = PlayerDisplayState.Normal;
@@ -137,6 +137,20 @@ namespace FoxTube
            quality.SelectionChanged += Quality_SelectionChanged;
            seek.ValueChanged += Seek_ValueChanged;

+            Player.Tapped += (s, e) =>
+            {
+                Rect view = new Rect(0, 0, centerTrigger.ActualWidth, centerTrigger.ActualHeight);
+                Point p = e.GetPosition(centerTrigger);
+
+                if (!view.Contains(p) || e.PointerDeviceType != Windows.Devices.Input.PointerDeviceType.Mouse)
+                    return;
+
+                if (Player.CurrentState == Windows.UI.Xaml.Media.MediaElementState.Playing)
+                    Player.Pause();
+                else if (Player.CurrentState == Windows.UI.Xaml.Media.MediaElementState.Paused)
+                    Player.Play();
+            };
+
            if (queue.Count > 0)
                foreach (Action i in queue)
                    i();
@@ -157,8 +171,6 @@ namespace FoxTube
            fwd = GetTemplateChild("SkipForwardButton") as Button;
            bwd = GetTemplateChild("SkipBackwardButton") as Button;
            captionsMenu = GetTemplateChild("CaptionsMenuButton") as Button;
-            settingsMenu = GetTemplateChild("QualityMenuButton") as Button;
-            fullscreen = GetTemplateChild("FullWindowButton") as Button;
            drag = GetTemplateChild("drag") as Button;

            Advert = GetTemplateChild("AdvertControl") as PlayerAdvert;
@@ -184,6 +196,7 @@ namespace FoxTube
            header = GetTemplateChild("header") as Grid;
            footer = GetTemplateChild("footer") as Grid;
            center = GetTemplateChild("center") as Grid;
+            centerTrigger = GetTemplateChild("centerTrigger") as Grid;
        }

        private void Seek_ValueChanged(object sender, RangeBaseValueChangedEventArgs e)
@@ -498,6 +511,8 @@ namespace FoxTube
                else
                    quality.SelectedIndex = 0;
            }
+
+            Focus(FocusState.Programmatic);
        }

        public void PushAdvert()
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" IgnorableNamespaces="uap mp uap3">
-  <Identity Name="53949MichaelXFoxGordeev.FoxTube" Publisher="CN=FD7A34DD-FE4D-4D7D-9D33-2DA9EBBE7725" Version="0.6.2.0" />
+  <Identity Name="53949MichaelXFoxGordeev.FoxTube" Publisher="CN=FD7A34DD-FE4D-4D7D-9D33-2DA9EBBE7725" Version="1.0.0.0" />
  <mp:PhoneIdentity PhoneProductId="04fd81c1-6473-4174-afd7-4ac71dd85721" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
  <Properties>
    <DisplayName>FoxTube</DisplayName>
@@ -94,7 +94,7 @@
        <ScrollViewer Grid.Column="1">
            <StackPanel Margin="10">
                <TextBlock FontWeight="Bold" Text="Hello, World!" FontSize="26" Name="title"/>
-                <controls:MarkdownTextBlock IsTextSelectionEnabled="True" Text="Content" Name="content" Background="Transparent"/>
+                <controls:MarkdownTextBlock LinkClicked="Content_LinkClicked" IsTextSelectionEnabled="True" Text="Content" Name="content" Background="Transparent"/>
            </StackPanel>
        </ScrollViewer>
        <Button Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Right" Background="Transparent" FontFamily="Segoe MDL2 Assets" Content="&#xE106;" Width="50" Height="50" Name="close" Click="close_Click"/>
@@ -16,7 +16,7 @@ namespace FoxTube.Pages.SettingsPages
    /// </summary>
    public sealed partial class Inbox : Page
    {
-        readonly List<InboxItem> items = new List<InboxItem>();
+        List<InboxItem> items = new List<InboxItem>();

        public Inbox()
        {
@@ -54,7 +54,7 @@ namespace FoxTube.Pages.SettingsPages
                });
            }

-            items.OrderBy(item => item.TimeStamp);
+            items = items.OrderBy(item => item.TimeStamp).Reverse().ToList();
            items.ForEach(i => list.Items.Add(i));

            if (!string.IsNullOrWhiteSpace(id))
@@ -67,6 +67,7 @@ namespace FoxTube.Pages.SettingsPages
                return;

            list.Items.Clear();
+            CloseView();

            switch (filter.SelectedIndex)
            {
@@ -131,5 +132,10 @@ namespace FoxTube.Pages.SettingsPages
            if (e.NewState == null)
                CloseView();
        }
+
+        private void Content_LinkClicked(object sender, Microsoft.Toolkit.Uwp.UI.Controls.LinkClickedEventArgs e)
+        {
+            Methods.ProcessLink(e.Link);
+        }
    }
 }
@@ -264,6 +264,8 @@
                                    </StackPanel>
                                </Grid>

+                                <Grid x:Name="centerTrigger" Grid.Row="1"/>
+
                                <Grid x:Name="center" Grid.Row="1" Visibility="Collapsed" Background="#7F000000">
                                    <Button x:Name="drag" IsHitTestVisible="False" Height="32" Width="47" Margin="0,0,47,0" Content="&#xE700;" Visibility="Collapsed" Padding="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" VerticalAlignment="Top" HorizontalAlignment="Right"/>
                                    <StackPanel x:Name="centerControls" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"/>
@@ -288,6 +290,9 @@
                                    <StackPanel x:Name="LeftFooterControls" Orientation="Horizontal" VerticalAlignment="Bottom">
                                        <Button x:Name="PlayPauseButton">
                                            <SymbolIcon x:Name="PlayPauseSymbol" Symbol="Play"/>
+                                            <Button.KeyboardAccelerators>
+                                                <KeyboardAccelerator Key="Space"/>
+                                            </Button.KeyboardAccelerators>
                                        </Button>
                                        <Button x:Name="NextButton" Content="&#xE101;"/>
                                        <Button x:Name="VolumeMenuButton" Content="&#xE15D;">
@@ -316,8 +321,16 @@
                                    </Grid>

                                    <StackPanel x:Name="RightFooterControls" Grid.Column="2" VerticalAlignment="Bottom" Orientation="Horizontal">
-                                        <Button x:Name="SkipBackwardButton" Content="&#xED3C;"/>
-                                        <Button x:Name="SkipForwardButton" Content="&#xED3D;"/>
+                                        <Button x:Name="SkipBackwardButton" Content="&#xED3C;">
+                                            <Button.KeyboardAccelerators>
+                                                <KeyboardAccelerator Key="Left"/>
+                                            </Button.KeyboardAccelerators>
+                                        </Button>
+                                        <Button x:Name="SkipForwardButton" Content="&#xED3D;">
+                                            <Button.KeyboardAccelerators>
+                                                <KeyboardAccelerator Key="Right"/>
+                                            </Button.KeyboardAccelerators>
+                                        </Button>
                                        <Line Stroke="White" StrokeThickness="2" Y1="5" Y2="45"/>
                                        <Button x:Name="CaptionsMenuButton" Content="&#xE7F0;">
                                            <Button.Flyout>
@@ -338,6 +351,9 @@
                                        </Button>
                                        <Button x:Name="FullWindowButton">
                                            <SymbolIcon x:Name="FullWindowSymbol" Symbol="FullScreen"/>
+                                            <Button.KeyboardAccelerators>
+                                                <KeyboardAccelerator Key="F11"/>
+                                            </Button.KeyboardAccelerators>
                                        </Button>
                                    </StackPanel>
                                </Grid>