diff --git a/ReiTunes/Package.appxmanifest b/ReiTunes/Package.appxmanifest index 6879f3e..61a0858 100644 --- a/ReiTunes/Package.appxmanifest +++ b/ReiTunes/Package.appxmanifest @@ -11,7 +11,7 @@ + Version="1.3.0.0" /> diff --git a/ReiTunes/ReiTunes.csproj b/ReiTunes/ReiTunes.csproj index 2a50a46..5bd0b50 100644 --- a/ReiTunes/ReiTunes.csproj +++ b/ReiTunes/ReiTunes.csproj @@ -153,6 +153,9 @@ + + LibraryItemInfo.xaml + Player.xaml @@ -233,6 +236,10 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + MSBuild:Compile Designer diff --git a/ReiTunes/Views/LibraryItemInfo.xaml b/ReiTunes/Views/LibraryItemInfo.xaml new file mode 100644 index 0000000..d7d7341 --- /dev/null +++ b/ReiTunes/Views/LibraryItemInfo.xaml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ReiTunes/Views/LibraryItemInfo.xaml.cs b/ReiTunes/Views/LibraryItemInfo.xaml.cs new file mode 100644 index 0000000..ddedbfc --- /dev/null +++ b/ReiTunes/Views/LibraryItemInfo.xaml.cs @@ -0,0 +1,34 @@ +using ReiTunes.Configuration; +using ReiTunes.Core; +using Windows.UI.Xaml.Controls; + +// The Content Dialog item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238 + +namespace ReiTunes.Views { + + public sealed partial class LibraryItemInfo : ContentDialog { + private readonly LibraryItem _item; + private PlayerViewModel _viewModel; + + public LibraryItemInfo(LibraryItem item) { + this.InitializeComponent(); + _item = item; + + foreach (var bookmark in _item.Bookmarks) { + BookmarksView.Items.Add(bookmark); + } + + _viewModel = ServiceLocator.Current.GetService(); + } + + private void ContentDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args) { + var selected = BookmarksView.SelectedItem as Bookmark; + + if (selected != null) { + if (_viewModel.CurrentlyPlayingItem == _item) { + _viewModel.MediaPlayer.PlaybackSession.Position = selected.Position; + } + } + } + } +} \ No newline at end of file diff --git a/ReiTunes/Views/Player.xaml b/ReiTunes/Views/Player.xaml index 6b8f72d..c612b6e 100644 --- a/ReiTunes/Views/Player.xaml +++ b/ReiTunes/Views/Player.xaml @@ -287,8 +287,9 @@ Text="Copy URL" /> + Click="ShowItemInfo" + Icon="Zoom" + Text="Show Info" />