From 81678b2db74d7a106030baa0aea021c1a625c807 Mon Sep 17 00:00:00 2001
From: MaKrotos <Darklider33@mail.ru>
Date: Tue, 7 May 2024 17:01:42 +0300
Subject: [PATCH] Fix

---
 VK UI3/Controllers/AudioPlayer.xaml.cs        |   6 +-
 VK UI3/VK UI3.csproj                          |   4 -
 VK UI3/VKs/IVK/IVKGetAudio.cs                 |   5 +-
 VK UI3/VKs/IVK/MessagesAudio.cs               |  97 ++++++-----
 VK UI3/VKs/IVK/MixAudio.cs                    |   2 +-
 VK UI3/Views/LoginWindow/Password.xaml.cs     |   2 -
 VK UI3/Views/SectionView.xaml.cs              |   3 +-
 VK UI3/Views/Share/ChatList.xaml              |  30 ----
 VK UI3/Views/Share/ChatList.xaml.cs           | 157 ------------------
 .../AttachmentsController.xaml                |  14 --
 .../AttachmentsController.xaml.cs             |  28 ----
 .../ShareControllers/ConvController.xaml.cs   |  14 +-
 VK UI3/Views/WaitView.xaml.cs                 |   2 +
 13 files changed, 76 insertions(+), 288 deletions(-)
 delete mode 100644 VK UI3/Views/Share/ChatList.xaml
 delete mode 100644 VK UI3/Views/Share/ChatList.xaml.cs
 delete mode 100644 VK UI3/Views/Share/ShareControllers/AttachmentsController.xaml
 delete mode 100644 VK UI3/Views/Share/ShareControllers/AttachmentsController.xaml.cs

diff --git a/VK UI3/Controllers/AudioPlayer.xaml.cs b/VK UI3/Controllers/AudioPlayer.xaml.cs
index 095c078..cbf21c3 100644
--- a/VK UI3/Controllers/AudioPlayer.xaml.cs	
+++ b/VK UI3/Controllers/AudioPlayer.xaml.cs	
@@ -584,10 +584,12 @@ private async static Task PlayTrack(long? v = null)
             mediaPlayer.Source = mediaPlaybackItem;
             mediaPlayer.Play();
 
-            iVKGetAudio.ChangePlayAudio();
-
+            iVKGetAudio.ChangePlayAudio(trackdata);
+            AudioPlayedChangeEvent.Invoke(trackdata, EventArgs.Empty);
         }
 
+        public static event EventHandler AudioPlayedChangeEvent;
+
 
 
         private void PreviousBTN_Tapped(object sender, TappedRoutedEventArgs e)
diff --git a/VK UI3/VK UI3.csproj b/VK UI3/VK UI3.csproj
index 7c64c90..24c5e2c 100644
--- a/VK UI3/VK UI3.csproj	
+++ b/VK UI3/VK UI3.csproj	
@@ -66,7 +66,6 @@
 	  <None Remove="Views\Settings\SettingsPage.xaml" />
 	  <None Remove="Views\Share\ConversationsList.xaml" />
 	  <None Remove="Views\Share\FriendsList.xaml" />
-	  <None Remove="Views\Share\ShareControllers\AttachmentsController.xaml" />
 	  <None Remove="Views\Share\ShareControllers\ConvController.xaml" />
 	  <None Remove="Views\Share\ShareControllers\FriendsList.xaml" />
 	  <None Remove="Views\Share\ShareControllers\UserControllers.xaml" />
@@ -200,9 +199,6 @@
     <Page Update="Views\Share\ShareControllers\FriendsList.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
     </Page>
-    <Page Update="Views\Share\ShareControllers\AttachmentsController.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Update="Views\Share\ConversationsList.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
     </Page>
diff --git a/VK UI3/VKs/IVK/IVKGetAudio.cs b/VK UI3/VKs/IVK/IVKGetAudio.cs
index 72b0ced..ded923f 100644
--- a/VK UI3/VKs/IVK/IVKGetAudio.cs	
+++ b/VK UI3/VKs/IVK/IVKGetAudio.cs	
@@ -66,11 +66,12 @@ public ObservableRangeCollection<ExtendedAudio> listAudio
         public void PhotoUpdated() { onPhotoUpdated?.RaiseEvent(this, EventArgs.Empty); }
 
 
-        private long? _countTracks { get; set; }
+        private long? _countTracks { get; set; } = null;
 
         public long? countTracks { get
             {
-                if (_countTracks != -1) return countTracks;
+                if (_countTracks == null) return null; 
+                if (_countTracks != -1) return _countTracks;
                 else return listAudio.Count;
             
             }
diff --git a/VK UI3/VKs/IVK/MessagesAudio.cs b/VK UI3/VKs/IVK/MessagesAudio.cs
index 975e358..7a69848 100644
--- a/VK UI3/VKs/IVK/MessagesAudio.cs	
+++ b/VK UI3/VKs/IVK/MessagesAudio.cs	
@@ -4,7 +4,10 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using TagLib.Ape;
 using VK_UI3.Helpers;
+using VK_UI3.Views.Share;
+using VkNet.Enums.SafetyEnums;
 using VkNet.Model;
 using VkNet.Model.Attachments;
 using VkNet.Model.RequestParams;
@@ -14,35 +17,43 @@ namespace VK_UI3.VKs.IVK
 {
     public class MessagesAudio : IVKGetAudio
     {
-        public MessagesAudio(long id, DispatcherQueue dispatcher) : base(id, dispatcher)
+        public MessagesAudio(MessConv messConv, DispatcherQueue dispatcher) : base(dispatcher)
         {
-            base.id = id.ToString();
+            base.id = messConv.conversation.Peer.LocalId.ToString();
+            this.messConv = messConv;
         }
-
+       
+        
         public override long? getCount()
         {
-            return api.Audio.GetCountAsync(long.Parse(id)).Result;
+            return -1;
         }
 
-        public User user;
+        MessConv messConv = null;
         public override string getName()
         {
             try
             {
-                List<long> ids = new List<long> { long.Parse(id) };
-                user = api.Users.GetAsync(ids).Result[0];
-
-                var request = new VkParameters
+                switch (messConv.conversation.Peer.Type.ToString())
                 {
-                    {"user_ids", string.Join(",", ids)},
-                    {"fields", string.Join(",", "photo_max_orig", "status")}
-                };
-
-                var response = api.Call("users.get", request);
-                user = User.FromJson(response[0]);
-
+                    case "chat":
+                        return messConv.conversation.ChatSettings.Title;
+                        
+
+                        break;
+                    case "user":
+                        return messConv.user.FirstName +" "+messConv.user.LastName;
+                        break;
+                    case "group":
+                        return messConv.group.Name;
+                        break;
+                    case "email":
+
+                        break;
+                    default:
+                        break;
+                }
 
-                return user.FirstName + " " + user.LastName;
             }
             catch (Exception ex)
             {
@@ -59,15 +70,27 @@ public override List<string> getPhotosList()
 
         public override Uri getPhoto()
         {
-            if (user != null)
+            switch (messConv.conversation.Peer.Type.ToString())
             {
-                return
-                    user.PhotoMaxOrig;
+                case "chat":
+                    return messConv.conversation.ChatSettings.Photo.JustGetPhoto;
+
+                    break;
+                case "user":
+                    return messConv.user.JustGetPhoto;
+                    break;
+                case "group":
+                    return messConv.group.JustGetPhoto;
+                    break;
+                case "email":
+
+                    break;
+                default:
+                    break;
             }
-            else
-                return null;
+            return null;
         }
-
+        string nextFrom = null;
         public override void GetTracks()
         {
             if (getLoadedTracks) return;
@@ -75,27 +98,25 @@ public override void GetTracks()
 
             Task.Run(async () =>
             {
-                int offset = listAudio.Count;
-                int count = 250;
+                
+                int count = 200;
 
-                if (countTracks > listAudio.Count)
-                {
+                
                     VkCollection<Audio> audios;
 
-
-                    audios = api.Audio.GetAsync(new AudioGetParams
+                    MessagesGetHistoryAttachmentsParams messagesGetHistoryAttachmentsParams = new MessagesGetHistoryAttachmentsParams()
                     {
-                        OwnerId = int.Parse(id),
-                        Offset = offset,
-                        Count = count
-                    }).Result;
-
+                        Count = 200,
+                        MediaType = MediaType.Audio,
+                        PeerId = messConv.conversation.Peer.Id,
+                        StartFrom = nextFrom
+                    };
 
+                    var attach = (VK.api.Messages.GetHistoryAttachments(messagesGetHistoryAttachmentsParams, out nextFrom));
                     ManualResetEvent resetEvent = new ManualResetEvent(false);
-
-                    foreach (var item in audios)
+                    foreach (var item in attach)
                     {
-                        ExtendedAudio extendedAudio = new ExtendedAudio(item, this);
+                        ExtendedAudio extendedAudio = new ExtendedAudio(item.Attachment.Instance as Audio, this);
 
                         DispatcherQueue.TryEnqueue(() =>
                         {
@@ -111,7 +132,7 @@ public override void GetTracks()
 
 
                     getLoadedTracks = false;
-                }
+               
                 NotifyOnListUpdate();
             });
         }
diff --git a/VK UI3/VKs/IVK/MixAudio.cs b/VK UI3/VKs/IVK/MixAudio.cs
index 82d0880..dfa6630 100644
--- a/VK UI3/VKs/IVK/MixAudio.cs	
+++ b/VK UI3/VKs/IVK/MixAudio.cs	
@@ -17,7 +17,7 @@ public MixAudio(string mix_id, DispatcherQueue dispatcher) : base(dispatcher)
         {
             this.mix_id = mix_id;
             //�� ����� � �� ����� ������� �������, ��?
-            this.countTracks = 10000000000000;
+            this.countTracks = -1;
             waitCreate = true;
             Task.Run(async () =>
             {
diff --git a/VK UI3/Views/LoginWindow/Password.xaml.cs b/VK UI3/Views/LoginWindow/Password.xaml.cs
index 4a4a371..5611560 100644
--- a/VK UI3/Views/LoginWindow/Password.xaml.cs	
+++ b/VK UI3/Views/LoginWindow/Password.xaml.cs	
@@ -21,8 +21,6 @@ public partial class Password : Page
         public int CodeLength { get; set; }
         public string? Info { get; set; }
 
-
-
         public string FirstName { get; set; } = "Незнакомец";
         public string Photo200 { get; set; } = "null";
         public string Phone { get; set; } = "***********";
diff --git a/VK UI3/Views/SectionView.xaml.cs b/VK UI3/Views/SectionView.xaml.cs
index da6d8f8..e8eeecf5 100644
--- a/VK UI3/Views/SectionView.xaml.cs	
+++ b/VK UI3/Views/SectionView.xaml.cs	
@@ -101,7 +101,8 @@ public enum SectionType
             MyListAudio,
             PlayList,
             UserPlayListList,
-            UserSection
+            UserSection,
+            MessConv
         }
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
diff --git a/VK UI3/Views/Share/ChatList.xaml b/VK UI3/Views/Share/ChatList.xaml
deleted file mode 100644
index b8fe956..0000000
--- a/VK UI3/Views/Share/ChatList.xaml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Page
-    x:Class="VK_UI3.Views.Share.ChatList"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:contr="using:VK_UI3.Views.Share.ShareControllers"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:VK_UI3.Views.Share"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Loading="Page_Loading"
-    mc:Ignorable="d">
-
-    <ListView
-        x:Name="scrollView"
-        Padding="0,4,0,4"
-        ItemsSource="{x:Bind attachments, Mode=OneWay}"
-        SelectionMode="None">
-        <ListView.ItemTemplate>
-            <DataTemplate>
-                <contr:AttachmentsController
-                    x:Name="DataController"
-                    Margin="-8,4,-8,4"
-                    />
-            </DataTemplate>
-        </ListView.ItemTemplate>
-        <ListView.Footer>
-            <ProgressRing x:Name="LoadingIndicator" IsActive="False" />
-        </ListView.Footer>
-    </ListView>
-</Page>
diff --git a/VK UI3/Views/Share/ChatList.xaml.cs b/VK UI3/Views/Share/ChatList.xaml.cs
deleted file mode 100644
index b19542a..0000000
--- a/VK UI3/Views/Share/ChatList.xaml.cs	
+++ /dev/null
@@ -1,157 +0,0 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-using System.Collections.ObjectModel;
-using System.Threading.Tasks;
-using TagLib;
-using VK_UI3.VKs;
-using VK_UI3.VKs.IVK;
-using VkNet.Enums.SafetyEnums;
-using VkNet.Exception;
-using VkNet.Model;
-using VkNet.Model.Attachments;
-using VkNet.Model.RequestParams;
-using VkNet.Utils;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace VK_UI3.Views.Share
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class ChatList : Microsoft.UI.Xaml.Controls.Page
-    {
-
-        ObservableCollection<HistoryAttachment> attachments = new ObservableCollection<HistoryAttachment>();
-        public ChatList()
-        {
-            this.InitializeComponent();
-            this.Loaded += FriendsList_Loaded;
-        }
-        ScrollViewer scrollViewer;
-        private void FriendsList_Loaded(object sender, RoutedEventArgs e)
-        {
-            scrollViewer = FindScrollViewer(scrollView);
-            if (scrollViewer != null)
-            {
-                // ������������� �� ������� ��������� ���������
-                scrollViewer.ViewChanged += ScrollViewer_ViewChanged; ;
-            }
-        }
-
-        private void Page_Loading(FrameworkElement sender, object args)
-        {
-            loadMoreFriends();
-        }
-        bool itsAll = false;
-        bool loadingNow = false;
-
-        private void ScrollViewer_ViewChanged(object sender, ScrollViewerViewChangedEventArgs e)
-        {
-            var isAtBottom = scrollViewer.VerticalOffset >= scrollViewer.ScrollableHeight - 50;
-            if (isAtBottom || CheckIfAllContentIsVisible(sender as ScrollViewer))
-            {
-
-                if (itsAll)
-                {
-                    LoadingIndicator.Visibility = Visibility.Collapsed;
-                    return;
-                }
-             
-                LoadingIndicator.Visibility = Visibility.Visible;
-                loadMoreFriends();
-                LoadingIndicator.IsActive = true;
-            }
-        }
-
-        private bool CheckIfAllContentIsVisible(ScrollViewer scrollViewer)
-        {
-            if (scrollViewer.ViewportHeight >= scrollViewer.ExtentHeight)
-            {
-                return true;
-            }
-            return false;
-        }
-
-        private ScrollViewer FindScrollViewer(DependencyObject d)
-        {
-            if (d is ScrollViewer)
-                return d as ScrollViewer;
-
-            for (int i = 0; i < VisualTreeHelper.GetChildrenCount(d); i++)
-            {
-                var sw = FindScrollViewer(VisualTreeHelper.GetChild(d, i));
-                if (sw != null) return sw;
-            }
-
-            return null;
-        }
-        int counted = 0;
-        private long peerID;
-        string nextFrom = null;
-        private async Task loadMoreFriends()
-        {
-
-         
-            if (itsAll)
-            {
-                this.DispatcherQueue.TryEnqueue(() =>
-                {
-                    LoadingIndicator.IsActive = false;
-                    LoadingIndicator.Visibility = Visibility.Collapsed;
-                });
-                return;
-            }
-            if (loadingNow) return;
-             loadingNow = true;
-
-            int off = 200;
-
-            var parameters = new VkParameters
-            {
-                { "count", off },
-                { "fields", "can_see_audio,photo_50,online, online, photo_100, photo_200_orig, status, nickname" },
-                { "offset", counted },
-                { "order", "name" }
-            };
-            counted += off;
-
-            MessagesGetHistoryAttachmentsParams messagesGetHistoryAttachmentsParams = new MessagesGetHistoryAttachmentsParams()
-            {
-                Count = 200,
-                MediaType = MediaType.Audio,
-                PeerId = this.peerID,
-                StartFrom = nextFrom
-              
-
-            };
-
-            var a = (VK.api.Messages.GetHistoryAttachments(messagesGetHistoryAttachmentsParams, out nextFrom));
-            
-
-            if (a.Count < off) itsAll = true;
-
-            this.DispatcherQueue.TryEnqueue(() =>
-            {
-                foreach (var item in a)
-                {
-                    attachments.Add(item);
-                }
-            });
-
-
-            if (itsAll)
-            {
-                this.DispatcherQueue.TryEnqueue(() =>
-                {
-                    LoadingIndicator.IsActive = false;
-                    LoadingIndicator.Visibility = Visibility.Collapsed;
-                });
-            }
-            loadingNow = false;
-                if (CheckIfAllContentIsVisible(scrollViewer)) loadMoreFriends();
-        }
-    }
-}
diff --git a/VK UI3/Views/Share/ShareControllers/AttachmentsController.xaml b/VK UI3/Views/Share/ShareControllers/AttachmentsController.xaml
deleted file mode 100644
index e74b702..0000000
--- a/VK UI3/Views/Share/ShareControllers/AttachmentsController.xaml	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<UserControl
-    x:Class="VK_UI3.Views.Share.ShareControllers.AttachmentsController"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:VK_UI3.Views.Share.ShareControllers"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
-
-    <Grid>
-
-    </Grid>
-</UserControl>
diff --git a/VK UI3/Views/Share/ShareControllers/AttachmentsController.xaml.cs b/VK UI3/Views/Share/ShareControllers/AttachmentsController.xaml.cs
deleted file mode 100644
index a421b91..0000000
--- a/VK UI3/Views/Share/ShareControllers/AttachmentsController.xaml.cs	
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace VK_UI3.Views.Share.ShareControllers
-{
-    public sealed partial class AttachmentsController : UserControl
-    {
-        public AttachmentsController()
-        {
-            this.InitializeComponent();
-        }
-    }
-}
diff --git a/VK UI3/Views/Share/ShareControllers/ConvController.xaml.cs b/VK UI3/Views/Share/ShareControllers/ConvController.xaml.cs
index 57c03f5..f79e935 100644
--- a/VK UI3/Views/Share/ShareControllers/ConvController.xaml.cs	
+++ b/VK UI3/Views/Share/ShareControllers/ConvController.xaml.cs	
@@ -7,6 +7,7 @@
 using System.Linq;
 using TagLib.Ape;
 using VK_UI3.Resource;
+using VK_UI3.VKs.IVK;
 using VkNet.Model;
 
 // To learn more about WinUI, the WinUI project structure,
@@ -23,13 +24,13 @@ public ConvController()
             animationsChangeImage = new Helpers.Animations.AnimationsChangeImage(userIcon, this.DispatcherQueue);
         }
         Helpers.Animations.AnimationsChangeImage animationsChangeImage;
-
+        MessConv messConv;
         private void UserControl_DataContextChanged(FrameworkElement sender, DataContextChangedEventArgs args)
         {
             
             if (DataContext is not MessConv messConv)
             { return; }
-
+            this.messConv = messConv;
 
             //ImagesGrid.Opacity = 0;
 
@@ -113,13 +114,8 @@ private void createAA(string AAs)
 
         private void StackPanel_PointerPressed(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
         {
-           // MainView.OpenSection(user.Id.ToString(), sectionType: SectionView.SectionType.UserSection);
-
-            //  if (e.GetCurrentPoint(sender as UIElement).Properties.IsLeftButtonPressed)
-            //  {
-
-            //      MainView.OpenPlayList(_PlayList.Playlist);
-            //  }
+            MessagesAudio messagesAudio = new MessagesAudio(messConv: messConv, dispatcher: DispatcherQueue);
+            MainView.OpenPlayList(messagesAudio);
 
         }
 
diff --git a/VK UI3/Views/WaitView.xaml.cs b/VK UI3/Views/WaitView.xaml.cs
index 16d5015..cf92a2f 100644
--- a/VK UI3/Views/WaitView.xaml.cs	
+++ b/VK UI3/Views/WaitView.xaml.cs	
@@ -220,6 +220,8 @@ private async Task LoadPlayList(HandlerContainer handlerContainer)
                         waitParameters.iVKGetAudio.onListUpdate -= (handlerContainer.Handler);
                     };
                 waitParameters.iVKGetAudio.onListUpdate += (handlerContainer.Handler);
+                if (!waitParameters.iVKGetAudio.getLoadedTracks)
+                    waitParameters.iVKGetAudio.GetTracks();
             }
         }