From 00184cb69ae158300c5c1d809d31fc1b8b874fd5 Mon Sep 17 00:00:00 2001 From: Rafael Rosa <116665025+rafael-rosa-knowcode@users.noreply.github.com> Date: Wed, 26 Apr 2023 15:49:48 -0300 Subject: [PATCH] chore: updates for comments Co-Authored-By: Carl de Billy --- .../HtmlMediaPlayer.cs | 12 ++++++---- .../HtmlVideo.cs | 5 ++-- .../MediaPlayerExtension.cs | 5 +++- .../MediaPlayerPresenterExtension.cs | 23 ++++++++----------- .../VideoStretch.cs | 12 ---------- src/SamplesApp/SamplesApp.Shared/App.xaml.cs | 2 +- .../MediaPlayerElement_Mov_Extension.xaml | 2 +- .../MediaPlayerElement/MediaPlayerElement.cs | 7 ++++-- .../MediaPlayerPresenter.Others.cs | 6 +++-- .../MediaPlayerPresenter.cs | 7 ++++-- .../Media/Playback/MediaPlayer.others.cs | 6 +++-- 11 files changed, 44 insertions(+), 43 deletions(-) delete mode 100644 src/AddIns/Uno.UI.MediaPlayer.WebAssembly/VideoStretch.cs diff --git a/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlMediaPlayer.cs b/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlMediaPlayer.cs index b080ff5958..2962322f2a 100644 --- a/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlMediaPlayer.cs +++ b/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlMediaPlayer.cs @@ -10,6 +10,7 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml; using System.Globalization; using Windows.UI.Xaml.Controls.Maps; +using Windows.UI.Xaml.Media; namespace Uno.UI.Media; @@ -447,20 +448,21 @@ internal partial class HtmlMediaPlayer : Border } } - internal void UpdateVideoStretch(VideoStretch stretch) + internal void UpdateVideoStretch(Stretch stretch) { + switch (stretch) { - case VideoStretch.None: + case Stretch.None: _htmlVideo.SetCssStyle("object-fit", "none"); break; - case VideoStretch.Fill: + case Stretch.Fill: _htmlVideo.SetCssStyle("object-fit", "fill"); break; - case VideoStretch.Uniform: + case Stretch.Uniform: _htmlVideo.SetCssStyle("object-fit", "cover"); break; - case VideoStretch.UniformToFill: + case Stretch.UniformToFill: _htmlVideo.SetCssStyle("object-fit", "contain"); break; } diff --git a/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlVideo.cs b/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlVideo.cs index 453f9f1a7b..3fd6b419f6 100644 --- a/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlVideo.cs +++ b/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/HtmlVideo.cs @@ -9,7 +9,8 @@ internal class HtmlVideo : UIElement public HtmlVideo() : base("video") { SetAttribute("background-color", "transparent"); - SetStyle("width", "100%"); - SetStyle("height", "100%"); + SetStyle( + ("width", "100%"), + ("height", "100%")); } } diff --git a/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerExtension.cs b/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerExtension.cs index 7e166d33a2..813f8c8fcb 100644 --- a/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerExtension.cs +++ b/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerExtension.cs @@ -243,7 +243,10 @@ public partial class MediaPlayerExtension : IMediaPlayerExtension public void InitializeSource() { - Console.WriteLine($"MediaPlayerExtension.InitializeSource()"); + if (this.Log().IsEnabled(LogLevel.Debug)) + { + this.Log().LogDebug("Enter MediaPlayerExtension.InitializeSource()."); + } NaturalDuration = TimeSpan.Zero; if (Position != TimeSpan.Zero) diff --git a/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerPresenterExtension.cs b/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerPresenterExtension.cs index f62bf2b75c..0c8fa1fb52 100644 --- a/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerPresenterExtension.cs +++ b/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/MediaPlayerPresenterExtension.cs @@ -2,6 +2,7 @@ using System; using Uno.Foundation.Extensibility; +using Uno.Foundation.Logging; using Uno.Media.Playback; using Windows.Foundation; using Windows.Media.Playback; @@ -33,8 +34,10 @@ public class MediaPlayerPresenterExtension : IMediaPlayerPresenterExtension public void MediaPlayerChanged() { - Console.WriteLine($"MediaPlayerPresenterExtension.MediaPlayerChanged()"); - + if (this.Log().IsEnabled(LogLevel.Debug)) + { + this.Log().LogDebug("Enter MediaPlayerPresenterExtension.MediaPlayerChanged()."); + } if (_owner is not null && MediaPlayerExtension.GetByMediaPlayer(_owner.MediaPlayer) is { } extension) { @@ -42,7 +45,10 @@ public class MediaPlayerPresenterExtension : IMediaPlayerPresenterExtension } else { - Console.WriteLine($"MediaPlayerPresenter.OnMediaPlayerChanged: Unable to find associated MediaPlayerExtension"); + if (this.Log().IsEnabled(LogLevel.Debug)) + { + this.Log().LogDebug($"MediaPlayerPresenter.OnMediaPlayerChanged: Unable to find associated MediaPlayerExtension"); + } } } @@ -51,16 +57,7 @@ public class MediaPlayerPresenterExtension : IMediaPlayerPresenterExtension { if (_owner is not null) { - var stretch = _owner.Stretch switch - { - Stretch.Uniform => VideoStretch.Uniform, - Stretch.Fill => VideoStretch.Fill, - Stretch.None => VideoStretch.None, - Stretch.UniformToFill => VideoStretch.UniformToFill, - _ => throw new NotSupportedException($"Stretch mode {_owner.Stretch} is not supported") - }; - - _htmlPlayer.UpdateVideoStretch(stretch); + _htmlPlayer.UpdateVideoStretch(_owner.Stretch); } } } diff --git a/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/VideoStretch.cs b/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/VideoStretch.cs deleted file mode 100644 index d61f21682b..0000000000 --- a/src/AddIns/Uno.UI.MediaPlayer.WebAssembly/VideoStretch.cs +++ /dev/null @@ -1,12 +0,0 @@ -#nullable enable - - -namespace Uno.UI.Media; - -internal enum VideoStretch -{ - Uniform, - Fill, - None, - UniformToFill -} diff --git a/src/SamplesApp/SamplesApp.Shared/App.xaml.cs b/src/SamplesApp/SamplesApp.Shared/App.xaml.cs index 505354ebbb..e06b872667 100644 --- a/src/SamplesApp/SamplesApp.Shared/App.xaml.cs +++ b/src/SamplesApp/SamplesApp.Shared/App.xaml.cs @@ -443,7 +443,7 @@ namespace SamplesApp // Runtime Tests control logging builder.AddFilter("Uno.UI.Samples.Tests", LogLevel.Information); - builder.AddFilter("Uno.UI.Media", LogLevel.Debug); + builder.AddFilter("Uno.UI.Media", LogLevel.Information); builder.AddFilter("Uno", LogLevel.Warning); builder.AddFilter("Windows", LogLevel.Warning); diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/MediaPlayerElement/MediaPlayerElement_Mov_Extension.xaml b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/MediaPlayerElement/MediaPlayerElement_Mov_Extension.xaml index a032130411..2f846a6cea 100644 --- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/MediaPlayerElement/MediaPlayerElement_Mov_Extension.xaml +++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/MediaPlayerElement/MediaPlayerElement_Mov_Extension.xaml @@ -4,7 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable=""> - diff --git a/src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerElement.cs b/src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerElement.cs index 73c8df4d69..72c031718e 100644 --- a/src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerElement.cs +++ b/src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerElement.cs @@ -4,6 +4,7 @@ using Windows.Media.Playback; using Windows.UI.Core; using Windows.UI.ViewManagement; using Windows.UI.Xaml.Media; +using Uno.Foundation.Logging; namespace Windows.UI.Xaml.Controls { @@ -44,8 +45,10 @@ namespace Windows.UI.Xaml.Controls { if (sender is MediaPlayerElement mpe) { - Console.WriteLine($"MediaPlayerElement.SourceChanged({args.NewValue})"); - + if (mpe.Log().IsEnabled(LogLevel.Debug)) + { + mpe.Log().LogDebug($"MediaPlayerElement.SourceChanged({args.NewValue})"); + } var source = args.NewValue as IMediaPlaybackSource; if (mpe.MediaPlayer != null) diff --git a/src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerPresenter.Others.cs b/src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerPresenter.Others.cs index 89ba34c79b..4926f05702 100644 --- a/src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerPresenter.Others.cs +++ b/src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerPresenter.Others.cs @@ -17,8 +17,10 @@ namespace Windows.UI.Xaml.Controls partial void InitializePartial() { - Console.WriteLine($"MediaPlayerPresenter"); - + if (this.Log().IsEnabled(LogLevel.Debug)) + { + this.Log().LogDebug($"Enter MediaPlayerPresenter InitializePartial"); + } if (!ApiExtensibility.CreateInstance(this, out _extension)) { if (this.Log().IsEnabled(LogLevel.Error)) diff --git a/src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerPresenter.cs b/src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerPresenter.cs index c8b25a0696..0a7941d99f 100644 --- a/src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerPresenter.cs +++ b/src/Uno.UI/UI/Xaml/Controls/MediaPlayerElement/MediaPlayerPresenter.cs @@ -3,6 +3,7 @@ using Windows.Foundation; using Windows.Media.Playback; using Windows.UI.Core; using Windows.UI.Xaml.Media; +using Uno.Foundation.Logging; namespace Windows.UI.Xaml.Controls { @@ -27,10 +28,12 @@ namespace Windows.UI.Xaml.Controls private static void OnMediaPlayerChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args) { - Console.WriteLine($"MediaPlayerPresenter.OnMediaPlayerChanged({args.NewValue})"); - if (sender is MediaPlayerPresenter presenter) { + if (presenter.Log().IsEnabled(LogLevel.Debug)) + { + presenter.Log().LogDebug($"MediaPlayerPresenter.OnMediaPlayerChanged({args.NewValue})"); + } if (args.OldValue is Windows.Media.Playback.MediaPlayer oldPlayer) { oldPlayer.VideoRatioChanged -= presenter.OnVideoRatioChanged; diff --git a/src/Uno.UWP/Media/Playback/MediaPlayer.others.cs b/src/Uno.UWP/Media/Playback/MediaPlayer.others.cs index 5654c93d24..902327d84a 100644 --- a/src/Uno.UWP/Media/Playback/MediaPlayer.others.cs +++ b/src/Uno.UWP/Media/Playback/MediaPlayer.others.cs @@ -18,8 +18,10 @@ namespace Windows.Media.Playback public void Initialize() { - Console.WriteLine($"MediaPlayer()"); - + if (this.Log().IsEnabled(LogLevel.Debug)) + { + this.Log().LogDebug("Enter Initialize MediaPlayer()."); + } if (!ApiExtensibility.CreateInstance(this, out _extension)) { -- GitLab