From 598c191c9dac41068a12880cefe7bd99b8460299 Mon Sep 17 00:00:00 2001
From: Dark Lider <darklider33@gmail.com>
Date: Sat, 30 Nov 2024 15:06:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=D0=BA=20=D1=82=D1=80=D0=B5=D0=BA=D0=BE=D0=B2.=20?=
 =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20=D0=B4=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BD=20=D1=81=D0=BB=D0=B0=D0=B9=D0=B4=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B0=20=D0=B7=D0=B2=D1=83=D0=BA=D0=B0.=20=D0=98=D1=81=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B4=D1=80=D1=83=D0=B3=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B5?=
 =?UTF-8?q?=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VK UI3 (Package)/Package.appxmanifest   |  2 +-
 VK UI3/Controllers/AudioPlayer.xaml     | 83 ++++++++-----------------
 VK UI3/Controllers/AudioPlayer.xaml.cs  |  2 +-
 VK UI3/Controls/LinksController.xaml.cs | 14 +++--
 VK UI3/Controls/TrackControl.xaml.cs    | 17 +++--
 VkNet/Model/Attachments/Audio.cs        |  2 +-
 VkNet/Model/Audio/AudioCover.cs         | 14 ++---
 7 files changed, 56 insertions(+), 78 deletions(-)

diff --git a/VK UI3 (Package)/Package.appxmanifest b/VK UI3 (Package)/Package.appxmanifest
index f9aaac97..85f26d95 100644
--- a/VK UI3 (Package)/Package.appxmanifest	
+++ b/VK UI3 (Package)/Package.appxmanifest	
@@ -13,7 +13,7 @@
   <Identity
     Name="FDW.VKM"
     Publisher="CN=FDW"
-    Version="0.2.1.1" />
+    Version="0.2.1.2" />
 
   <mp:PhoneIdentity PhoneProductId="b7c1f34e-9025-4935-9d7a-7d0a632a368d" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
diff --git a/VK UI3/Controllers/AudioPlayer.xaml b/VK UI3/Controllers/AudioPlayer.xaml
index 09d0acf0..0c6222c1 100644
--- a/VK UI3/Controllers/AudioPlayer.xaml	
+++ b/VK UI3/Controllers/AudioPlayer.xaml	
@@ -147,63 +147,27 @@
                         Background="Transparent">
                         <FontIcon FontSize="14" Glyph="&#xE995;" />
                         <Button.Flyout>
-                            <Flyout>
-                                <Slider
-                                    x:Name="SoundSlider"
-                                    Grid.Column="2"
-                                    Width="150"
-                                    VerticalAlignment="Center"
-                                    Minimum="0"
-                                    Orientation="Horizontal"
-                                    PointerEntered="SoundSlider_PointerEntered"
-                                    PointerExited="SoundSlider_PointerExited"
-                                    StepFrequency="1"
-                                    ValueChanged="SoundSlider_ValueChanged"
-                                    Value="{x:Bind simpleAudioBind, Mode=TwoWay}">
-                                    <Slider.Template>
-                                        <ControlTemplate TargetType="Slider">
-                                            <Grid>
-                                                <VisualStateManager.VisualStateGroups>
-                                                    <!--  Оставьте эту часть без изменений, чтобы сохранить оригинальное поведение слайдера  -->
-                                                </VisualStateManager.VisualStateGroups>
-                                                <Grid>
-                                                    <Grid
-                                                        Height="4"
-                                                        Background="{TemplateBinding Background}"
-                                                        CornerRadius="2" />
-                                                    <Grid x:Name="HorizontalTemplate" Background="Transparent">
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="Auto" />
-                                                            <ColumnDefinition Width="Auto" />
-                                                            <ColumnDefinition Width="*" />
-                                                        </Grid.ColumnDefinitions>
-                                                        <Grid
-                                                            x:Name="HorizontalTrack"
-                                                            Height="4"
-                                                            Margin="0,0,-10,0"
-                                                            Background="{TemplateBinding Foreground}"
-                                                            CornerRadius="2" />
-                                                        <Rectangle
-                                                            x:Name="HorizontalDecreaseRect"
-                                                            Height="4"
-                                                            Fill="Transparent" />
-                                                        <Thumb
-                                                            x:Name="HorizontalThumb"
-                                                            Grid.Column="1"
-                                                            Width="10"
-                                                            Height="10"
-                                                            Background="Transparent"
-                                                            CornerRadius="10">
-                                                            <ToolTipService.ToolTip>
-                                                                <ToolTip Content="{TemplateBinding Value}" />
-                                                            </ToolTipService.ToolTip>
-                                                        </Thumb>
-                                                    </Grid>
-                                                </Grid>
-                                            </Grid>
-                                        </ControlTemplate>
-                                    </Slider.Template>
-                                </Slider>
+                            <Flyout >
+                                <Grid Margin="-15"   Height="27">
+                                    <Slider
+                                        
+                                        Margin="10,-1,10,0"
+                                        x:Name="SoundSlider"
+                                        Grid.Column="2"
+                                        Width="150"
+                                        VerticalAlignment="Top"
+                                        Minimum="0"
+                                        Background="AliceBlue"
+                                        Orientation="Horizontal"
+                                        PointerEntered="SoundSlider_PointerEntered"
+                                        PointerExited="SoundSlider_PointerExited"
+                                        StepFrequency="1"
+                                        ValueChanged="SoundSlider_ValueChanged"
+                                        Value="{x:Bind simpleAudioBind, Mode=TwoWay}">
+
+
+                                    </Slider>
+                                </Grid>
                             </Flyout>
                         </Button.Flyout>
 
@@ -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}" >
+                        
+                    </Slider>
                     <TextBlock
                         Grid.Column="2"
                         VerticalAlignment="Center"
diff --git a/VK UI3/Controllers/AudioPlayer.xaml.cs b/VK UI3/Controllers/AudioPlayer.xaml.cs
index 48fa0305..160dd8bb 100644
--- a/VK UI3/Controllers/AudioPlayer.xaml.cs	
+++ b/VK UI3/Controllers/AudioPlayer.xaml.cs	
@@ -310,7 +310,7 @@ private void PlaybackSession_BufferedRangesChanged(MediaPlaybackSession sender,
             var a = (int)Math.Round(sender.NaturalDuration.TotalSeconds);
             var b = TrackDataThis.audio.Duration;
 
-            if (Math.Abs(a - b) > 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 2bb1187a..a31d207e 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 5c19b076..2f2dad36 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 8751cd78..1177f5b1 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 44d9260a..b1df135f 100644
--- a/VkNet/Model/Audio/AudioCover.cs
+++ b/VkNet/Model/Audio/AudioCover.cs
@@ -14,43 +14,43 @@ public class AudioCover
 		/// Uri обложки с максимальным размером 34x34.
 		/// </summary>
 		[JsonProperty("photo_34")]
-		public string Photo34 { get; set; }
+		public string? Photo34 { get; set; }
 
 		/// <summary>
 		/// Uri обложки с максимальным размером 68x68.
 		/// </summary>
 		[JsonProperty("photo_68")]
-		public string Photo68 { get; set; }
+		public string? Photo68 { get; set; }
 
 		/// <summary>
 		/// Uri обложки с максимальным размером 135x135.
 		/// </summary>
 		[JsonProperty("photo_135")]
-		public string Photo135 { get; set; }
+		public string? Photo135 { get; set; }
 
 		/// <summary>
 		/// Uri обложки с максимальным размером 270x270.
 		/// </summary>
 		[JsonProperty("photo_270")]
-		public string Photo270 { get; set; }
+		public string? Photo270 { get; set; }
 
 		/// <summary>
 		/// Uri обложки с максимальным размером 300x300.
 		/// </summary>
 		[JsonProperty("photo_300")]
-		public string Photo300 { get; set; }
+		public string? Photo300 { get; set; }
 
 		/// <summary>
 		/// Uri обложки с максимальным размером 600x600.
 		/// </summary>
 		[JsonProperty("photo_600")]
-		public string Photo600 { get; set; }
+		public string? Photo600 { get; set; }
 
         /// <summary>
         /// Uri обложки с максимальным размером 1200x1200.
         /// </summary>
         [JsonProperty("photo_1200")]
-        public string Photo1200 { get; set; }
+        public string? Photo1200 { get; set; }
 
         /// <summary>
         /// Ширина изображения обложки.