diff --git a/VK UI3 (Package)/Package.appxmanifest b/VK UI3 (Package)/Package.appxmanifest index f9aaac9..85f26d9 100644 --- a/VK UI3 (Package)/Package.appxmanifest +++ b/VK UI3 (Package)/Package.appxmanifest @@ -13,7 +13,7 @@ + Version="0.2.1.2" /> diff --git a/VK UI3/Controllers/AudioPlayer.xaml b/VK UI3/Controllers/AudioPlayer.xaml index 09d0acf..0c6222c 100644 --- a/VK UI3/Controllers/AudioPlayer.xaml +++ b/VK UI3/Controllers/AudioPlayer.xaml @@ -147,63 +147,27 @@ Background="Transparent"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + @@ -246,6 +210,7 @@ x:Name="VolumeSlider" Grid.Column="1" Margin="8,0,8,0" + HorizontalAlignment="Stretch" VerticalAlignment="Center" Maximum="{x:Bind TrackDuration, Mode=TwoWay}" @@ -255,7 +220,9 @@ StepFrequency="1" ThumbToolTipValueConverter="{StaticResource SecondsToTimeConverter}" ValueChanged="VolumeSlider_ValueChanged" - Value="{x:Bind TrackPosition, Mode=TwoWay}" /> + Value="{x:Bind TrackPosition, Mode=TwoWay}" > + + 3) + if (Math.Abs(a - b) > 5) { PlayTrack(); } diff --git a/VK UI3/Controls/LinksController.xaml.cs b/VK UI3/Controls/LinksController.xaml.cs index 2bb1187..a31d207 100644 --- a/VK UI3/Controls/LinksController.xaml.cs +++ b/VK UI3/Controls/LinksController.xaml.cs @@ -116,7 +116,7 @@ private void PlaylistControl_Unloaded(object sender, RoutedEventArgs e) private async void Grid_PointerPressed(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e) { - + try { if (link.Meta.ContentType == null) @@ -218,11 +218,15 @@ private async void Grid_PointerPressed(object sender, Microsoft.UI.Xaml.Input.Po } catch (Exception ex) { - Process.Start(new ProcessStartInfo + try { - FileName = link.Url, - UseShellExecute = true - }); + Process.Start(new ProcessStartInfo + { + FileName = link.Url, + UseShellExecute = true + }); + } + catch { } } } diff --git a/VK UI3/Controls/TrackControl.xaml.cs b/VK UI3/Controls/TrackControl.xaml.cs index 5c19b07..2f2dad3 100644 --- a/VK UI3/Controls/TrackControl.xaml.cs +++ b/VK UI3/Controls/TrackControl.xaml.cs @@ -82,12 +82,19 @@ private void TrackControl_DataContextChanged(FrameworkElement sender, DataContex dataTrack = (DataContext as ExtendedAudio); string? newLink = ""; - if (dataTrack.audio.Album != null && dataTrack.audio.Album.Thumb != null) + if (dataTrack.audio.Thumb != null) + { + newLink = + dataTrack.audio.Thumb.Photo270 ?? + dataTrack.audio.Thumb.Photo300 ?? + dataTrack.audio.Thumb.Photo600 ?? + dataTrack.audio.Thumb.Photo34 ?? + ""; + } + + + if (dataTrack.audio.Album != null && dataTrack.audio.Album.Thumb != null && newLink.Equals("")) newLink = - dataTrack.audio.Thumb.Photo270 ?? - dataTrack.audio.Thumb.Photo300 ?? - dataTrack.audio.Thumb.Photo600 ?? - dataTrack.audio.Thumb.Photo34 ?? dataTrack.audio.Album.Thumb.Photo270 ?? dataTrack.audio.Album.Thumb.Photo300 ?? diff --git a/VkNet/Model/Attachments/Audio.cs b/VkNet/Model/Attachments/Audio.cs index 8751cd7..1177f5b 100644 --- a/VkNet/Model/Attachments/Audio.cs +++ b/VkNet/Model/Attachments/Audio.cs @@ -170,7 +170,7 @@ public class Audio : MediaAttachment, IGroupUpdate public AudioChartInfo AudioChartInfo { get; set; } [JsonProperty("thumb")] - public AudioCover Thumb { get; set; } + public AudioCover? Thumb { get; set; } diff --git a/VkNet/Model/Audio/AudioCover.cs b/VkNet/Model/Audio/AudioCover.cs index 44d9260..b1df135 100644 --- a/VkNet/Model/Audio/AudioCover.cs +++ b/VkNet/Model/Audio/AudioCover.cs @@ -14,43 +14,43 @@ public class AudioCover /// Uri обложки с максимальным размером 34x34. /// [JsonProperty("photo_34")] - public string Photo34 { get; set; } + public string? Photo34 { get; set; } /// /// Uri обложки с максимальным размером 68x68. /// [JsonProperty("photo_68")] - public string Photo68 { get; set; } + public string? Photo68 { get; set; } /// /// Uri обложки с максимальным размером 135x135. /// [JsonProperty("photo_135")] - public string Photo135 { get; set; } + public string? Photo135 { get; set; } /// /// Uri обложки с максимальным размером 270x270. /// [JsonProperty("photo_270")] - public string Photo270 { get; set; } + public string? Photo270 { get; set; } /// /// Uri обложки с максимальным размером 300x300. /// [JsonProperty("photo_300")] - public string Photo300 { get; set; } + public string? Photo300 { get; set; } /// /// Uri обложки с максимальным размером 600x600. /// [JsonProperty("photo_600")] - public string Photo600 { get; set; } + public string? Photo600 { get; set; } /// /// Uri обложки с максимальным размером 1200x1200. /// [JsonProperty("photo_1200")] - public string Photo1200 { get; set; } + public string? Photo1200 { get; set; } /// /// Ширина изображения обложки.