From 039a504d5637736a440e5a283615cc64174e1e30 Mon Sep 17 00:00:00 2001
From: Michael Gordeev <mikhailagord@gmail.com>
Date: Sun, 5 Aug 2018 23:42:02 +0300
Subject: [PATCH] seek indicator for miniview & s char after secured links
 fixed

---
 FoxTube/Classes/Methods.cs           |  9 +++++++--
 FoxTube/Controls/VideoPlayer.xaml    |  1 +
 FoxTube/Controls/VideoPlayer.xaml.cs | 15 ++++++++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/FoxTube/Classes/Methods.cs b/FoxTube/Classes/Methods.cs
index 8779977..e3abc67 100644
--- a/FoxTube/Classes/Methods.cs
+++ b/FoxTube/Classes/Methods.cs
@@ -1,5 +1,6 @@
 using MyToolkit.Multimedia;
 using System;
+using System.Diagnostics;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Windows.UI;
@@ -56,20 +57,24 @@ namespace FoxTube
             Regex regx = new Regex(@"(http(s)?://[\S]+|www.[\S]+|[\S]+@[\S]+)", RegexOptions.IgnoreCase);
             Regex isWWW = new Regex(@"(http[s]?://[\S]+|www.[\S]+)");
             Regex isEmail = new Regex(@"[\S]+@[\S]+");
-            foreach (var item in regx.Split(text))
+            foreach (string item in regx.Split(text))
             {
                 if (isWWW.IsMatch(item))
                 {
-                    Hyperlink link = new Hyperlink { NavigateUri = new Uri(item.ToLower().StartsWith("http") ? item : $"http://{item}"), Foreground = new SolidColorBrush(Colors.Red) };
+                    Debug.WriteLine(item);
+                    Hyperlink link = new Hyperlink { NavigateUri = new Uri(item), Foreground = new SolidColorBrush(Colors.Red) };
                     link.Inlines.Add(new Run { Text = item });
                     block.Inlines.Add(link);
                 }
                 else if (isEmail.IsMatch(item))
                 {
+                    Debug.WriteLine(item);
                     Hyperlink link = new Hyperlink { NavigateUri = new Uri($"mailto:{item}"), Foreground = new SolidColorBrush(Colors.Red) };
                     link.Inlines.Add(new Run { Text = item });
                     block.Inlines.Add(link);
                 }
+                else if (item == "s")
+                    continue;
                 else block.Inlines.Add(new Run { Text = item });
             }
         }
diff --git a/FoxTube/Controls/VideoPlayer.xaml b/FoxTube/Controls/VideoPlayer.xaml
index 6dae30a..0f2f6b9 100644
--- a/FoxTube/Controls/VideoPlayer.xaml
+++ b/FoxTube/Controls/VideoPlayer.xaml
@@ -57,6 +57,7 @@
                         Content="&#xE010;"
                         Width="45" Height="45"
                         ToolTipService.ToolTip="Maximize"/>
+                <ProgressBar VerticalAlignment="Bottom" Foreground="Red" Name="seekIndicator" Visibility="Collapsed"/>
             </Grid>
 
             <Button Name="skipAd" Visibility="Collapsed" Margin="0,0,0,25" Grid.Row="1" HorizontalAlignment="Right" Foreground="White" VerticalAlignment="Bottom" Padding="10" BorderBrush="Black" BorderThickness="2" Background="#7E000000">
diff --git a/FoxTube/Controls/VideoPlayer.xaml.cs b/FoxTube/Controls/VideoPlayer.xaml.cs
index 3e639f4..625da40 100644
--- a/FoxTube/Controls/VideoPlayer.xaml.cs
+++ b/FoxTube/Controls/VideoPlayer.xaml.cs
@@ -234,6 +234,7 @@ namespace FoxTube
 
             total = XmlConvert.ToTimeSpan(item.ContentDetails.Duration);
             seek.Maximum = total.TotalSeconds;
+            seekIndicator.Maximum = total.TotalSeconds;
 
             elapsed = TimeSpan.FromSeconds(seek.Value);
             remaining = total.Subtract(elapsed);
@@ -321,6 +322,7 @@ namespace FoxTube
         void SeekElapsed()
         {
             seek.Value = videoSource.Position.TotalSeconds;
+            seekIndicator.Value = seek.Value;
         }
 
         void Elapsed()
@@ -332,6 +334,7 @@ namespace FoxTube
                     touchCentral.Visibility = Visibility.Collapsed;
                 if (pointerCaptured)
                     Window.Current.CoreWindow.PointerCursor = null;
+                seekIndicator.Visibility = Visibility.Collapsed;
                 t.Stop();
             }
         }
@@ -411,10 +414,9 @@ namespace FoxTube
 
         void ShowControls()
         {
-            if(controls.Visibility == Visibility.Collapsed)
-            {
-                controls.Visibility = Visibility.Visible;
-            }
+            controls.Visibility = Visibility.Visible;
+            if (miniView)
+                seekIndicator.Visibility = Visibility.Visible;
             if (pointerCaptured)
                 Window.Current.CoreWindow.PointerCursor = cursorBackup;
             t.Stop();
@@ -603,6 +605,7 @@ namespace FoxTube
                 }
 
                 await ApplicationView.GetForCurrentView().TryEnterViewModeAsync(ApplicationViewMode.CompactOverlay);
+                pointerCaptured = false;
                 
                 titleBar.ButtonBackgroundColor = Colors.Transparent;
                 titleBar.ButtonInactiveBackgroundColor = Colors.Transparent;
@@ -717,6 +720,7 @@ namespace FoxTube
             Width = 432;
             Height = 243;
 
+            miniView = true;
             Methods.MainPage.MinimizeVideo();
             
             mainControls.Visibility = Visibility.Collapsed;
@@ -738,11 +742,12 @@ namespace FoxTube
 
         private void maximize_Click(object sender, RoutedEventArgs e)
         {
-            SetFullSize.Invoke(this, null);
+            SetFullSize.Invoke(this, false);
 
             Width = double.NaN;
             Height = double.NaN;
 
+            miniView = false;
             Methods.MainPage.MaximizeVideo();
 
             mainControls.Visibility = Visibility.Visible;