Orphaned code

UnigramDev · Sep 19, 2021 · 27f1ea7 · 27f1ea7
1 parent 4682ded
commit 27f1ea7
Show file tree

Hide file tree

Showing 18 changed files with 216 additions and 32 deletions.
diff --git a/Unigram/Unigram.Native.Calls/Unigram.Native.Calls.vcxproj b/Unigram/Unigram.Native.Calls/Unigram.Native.Calls.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.210825.3\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210825.3\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -478,15 +478,15 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\FFmpeg.UWP.4.1.5\build\native\FFmpeg.UWP.targets" Condition="Exists('..\packages\FFmpeg.UWP.4.1.5\build\native\FFmpeg.UWP.targets')" />
     <Import Project="..\packages\Win2D.uwp.1.26.0\build\native\Win2D.uwp.targets" Condition="Exists('..\packages\Win2D.uwp.1.26.0\build\native\Win2D.uwp.targets')" />
-    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.210825.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210825.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\FFmpeg.UWP.4.1.5\build\native\FFmpeg.UWP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\FFmpeg.UWP.4.1.5\build\native\FFmpeg.UWP.targets'))" />
     <Error Condition="!Exists('..\packages\Win2D.uwp.1.26.0\build\native\Win2D.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Win2D.uwp.1.26.0\build\native\Win2D.uwp.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210825.3\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.210825.3\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210825.3\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.210825.3\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>
diff --git a/Unigram/Unigram.Native.Calls/packages.config b/Unigram/Unigram.Native.Calls/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FFmpeg.UWP" version="4.1.5" targetFramework="native" />
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.210629.4" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.210913.7" targetFramework="native" />
   <package id="Win2D.uwp" version="1.26.0" targetFramework="native" />
 </packages>
diff --git a/Unigram/Unigram.Native/Unigram.Native.vcxproj b/Unigram/Unigram.Native/Unigram.Native.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.210629.4\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210629.4\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
@@ -505,15 +505,15 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\FFmpeg.UWP.4.1.5\build\native\FFmpeg.UWP.targets" Condition="Exists('..\packages\FFmpeg.UWP.4.1.5\build\native\FFmpeg.UWP.targets')" />
     <Import Project="..\packages\Win2D.uwp.1.26.0\build\native\Win2D.uwp.targets" Condition="Exists('..\packages\Win2D.uwp.1.26.0\build\native\Win2D.uwp.targets')" />
-    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.210629.4\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210629.4\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\FFmpeg.UWP.4.1.5\build\native\FFmpeg.UWP.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\FFmpeg.UWP.4.1.5\build\native\FFmpeg.UWP.targets'))" />
     <Error Condition="!Exists('..\packages\Win2D.uwp.1.26.0\build\native\Win2D.uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Win2D.uwp.1.26.0\build\native\Win2D.uwp.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210629.4\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.210629.4\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210629.4\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.210629.4\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.210913.7\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>
diff --git a/Unigram/Unigram.Native/packages.config b/Unigram/Unigram.Native/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FFmpeg.UWP" version="4.1.5" targetFramework="native" />
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.210629.4" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.210913.7" targetFramework="native" />
   <package id="Win2D.uwp" version="1.26.0" targetFramework="native" />
 </packages>
diff --git a/Unigram/Unigram/Assets/Fonts/Telegram.json b/Unigram/Unigram/Assets/Fonts/Telegram.json
@@ -7152,5 +7152,6 @@
     },
     "gridSize": 16
   },
-  "uid": -1
+  "uid": -1,
+  "time": 1631371331612
 }
diff --git a/Unigram/Unigram/Common/MenuFlyoutHelper.cs b/Unigram/Unigram/Common/MenuFlyoutHelper.cs
@@ -126,6 +126,7 @@ public static void CreateFlyoutItem<T>(this IList<MenuFlyoutItemBase> items, Fun
                 {
                     if (icon is FontIcon fontIcon)
                     {
+                        //fontIcon.Margin = new Thickness(-2);
                         fontIcon.FontSize = 20;
                         fontIcon.FontFamily = BootStrapper.Current.Resources["TelegramThemeFontFamily"] as FontFamily;
                     }
@@ -157,6 +158,7 @@ public static void CreateFlyoutItem<T1, T2, T3>(this MenuFlyout flyout, Func<T1,
                 {
                     if (icon is FontIcon fontIcon)
                     {
+                        //fontIcon.Margin = new Thickness(-2);
                         fontIcon.FontSize = 20;
                         fontIcon.FontFamily = BootStrapper.Current.Resources["TelegramThemeFontFamily"] as FontFamily;
                     }
@@ -189,6 +191,8 @@ public static MenuFlyoutItem CreateFlyoutItem(this MenuFlyout flyout, ICommand c
             {
                 if (icon is FontIcon fontIcon)
                 {
+                    //fontIcon.Margin = new Thickness(-2);
+                    fontIcon.FontSize = 20;
                     fontIcon.FontFamily = BootStrapper.Current.Resources["TelegramThemeFontFamily"] as FontFamily;
                 }
 
@@ -246,6 +250,7 @@ public static MenuFlyoutItem CreateFlyoutItem(this IList<MenuFlyoutItemBase> ite
             {
                 if (icon is FontIcon fontIcon)
                 {
+                    //fontIcon.Margin = new Thickness(-2);
                     fontIcon.FontSize = 20;
                     fontIcon.FontFamily = BootStrapper.Current.Resources["TelegramThemeFontFamily"] as FontFamily;
                 }
@@ -261,5 +266,15 @@ public static MenuFlyoutItem CreateFlyoutItem(this IList<MenuFlyoutItemBase> ite
             items.Add(flyoutItem);
             return flyoutItem;
         }
+
+        public static FontIcon Icon(string glyph)
+        {
+            return new FontIcon
+            {
+                Glyph = glyph,
+                FontFamily = BootStrapper.Current.Resources["TelegramThemeFontFamily"] as FontFamily,
+                Margin = new Thickness(-2)
+            };
+        }
     }
 }
diff --git a/Unigram/Unigram/Controls/Cells/SharedFileCell.xaml.cs b/Unigram/Unigram/Controls/Cells/SharedFileCell.xaml.cs
@@ -217,13 +217,12 @@ private string UpdateTimeLabel(Message message)
 
         private void Button_Click(object sender, RoutedEventArgs e)
         {
-            var data = _message.GetFileAndName(false);
-            if (data.File == null)
+            var file = _message.GetFile();
+            if (file == null)
             {
                 return;
             }
 
-            var file = data.File;
             if (file.Local.IsDownloadingActive)
             {
                 _protoService.Send(new CancelDownloadFile(file.Id, false));

diff --git a/Unigram/Unigram/Navigation/Services/FrameFacade.cs b/Unigram/Unigram/Navigation/Services/FrameFacade.cs
@@ -296,6 +296,7 @@ private void FacadeNavigatedEventHandler(object sender, NavigationEventArgs e)
             }
 
             var args = new NavigatedEventArgs(e, Content as Page);
+            args.Parameter = CurrentPageParam;
 
             if (NavigationModeHint != NavigationMode.New)
             {

diff --git a/Unigram/Unigram/Selectors/MessageContentTemplateSelector.cs b/Unigram/Unigram/Selectors/MessageContentTemplateSelector.cs
@@ -10,6 +10,7 @@ public class MessageContentTemplateSelector : DataTemplateSelector
         public DataTemplate PhotoTemplate { get; set; }
         public DataTemplate VideoTemplate { get; set; }
         public DataTemplate TextTemplate { get; set; }
+        public DataTemplate AnimationTemplate { get; set; }
         public DataTemplate MessageTemplate { get; set; }
         public DataTemplate HeaderDateTemplate { get; set; }
 
@@ -25,6 +26,8 @@ protected override DataTemplate SelectTemplateCore(object item, DependencyObject
                         return MessageTemplate ?? VideoTemplate;
                     case MessageText:
                         return MessageTemplate ?? TextTemplate;
+                    case MessageAnimation:
+                        return MessageTemplate ?? AnimationTemplate;
                     case MessageHeaderDate:
                         return HeaderDateTemplate;
                     default:
@@ -41,6 +44,8 @@ protected override DataTemplate SelectTemplateCore(object item, DependencyObject
                         return MessageTemplate ?? VideoTemplate;
                     case MessageText:
                         return MessageTemplate ?? TextTemplate;
+                    case MessageAnimation:
+                        return MessageTemplate ?? AnimationTemplate;
                     case MessageHeaderDate:
                         return HeaderDateTemplate;
                     default:

diff --git a/Unigram/Unigram/Unigram.csproj b/Unigram/Unigram/Unigram.csproj
@@ -537,15 +537,21 @@
     <Compile Include="Views\Popups\BackgroundPopup.xaml.cs">
       <DependentUpon>BackgroundPopup.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Popups\ChooseColorPopup.xaml.cs">
+      <DependentUpon>ChooseColorPopup.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Popups\ChooseRadioPopup.xaml.cs">
+      <DependentUpon>ChooseRadioPopup.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Popups\InputPopup.xaml.cs">
       <DependentUpon>InputPopup.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Popups\RecordVoiceChatPopup.xaml.cs">
+      <DependentUpon>RecordVoiceChatPopup.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Popups\ScheduleVoiceChatPopup.xaml.cs">
       <DependentUpon>ScheduleVoiceChatPopup.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\Popups\SelectColorPopup.xaml.cs">
-      <DependentUpon>SelectColorPopup.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\Popups\ChatThemePopup.xaml.cs">
       <DependentUpon>ChatThemePopup.xaml</DependentUpon>
     </Compile>
@@ -880,9 +886,6 @@
     <Compile Include="Views\Popups\ScheduleMessagePopup.xaml.cs">
       <DependentUpon>ScheduleMessagePopup.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\Popups\SelectRadioPopup.xaml.cs">
-      <DependentUpon>SelectRadioPopup.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\Popups\SendFilesPopup.xaml.cs">
       <DependentUpon>SendFilesPopup.xaml</DependentUpon>
     </Compile>
@@ -1711,15 +1714,23 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\Popups\ChooseColorPopup.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\Popups\ChooseRadioPopup.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\Popups\InputPopup.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\Popups\ScheduleVoiceChatPopup.xaml">
+    <Page Include="Views\Popups\RecordVoiceChatPopup.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\Popups\SelectColorPopup.xaml">
+    <Page Include="Views\Popups\ScheduleVoiceChatPopup.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -1907,10 +1918,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\Popups\SelectRadioPopup.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\Popups\SendFilesPopup.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -2273,7 +2280,7 @@
     </Reference>
     <ReferenceCopyLocalPaths Include="$(ProjectDir)\..\Libraries\rlottie\$(Platform)\RLottie.dll" />
     <ReferenceCopyLocalPaths Include="$(ProjectDir)\..\Libraries\rlottie\$(Platform)\RLottie.pri" />
-    <ReferenceCopyLocalPaths Condition=" '$(Configuration)' == 'Debug' " Include="$(ProjectDir)\..\Libraries\rlottie\$(Platform)\zlib1.dll" />
+    <!--<ReferenceCopyLocalPaths Condition=" '$(Configuration)' == 'Debug' " Include="$(ProjectDir)\..\Libraries\rlottie\$(Platform)\zlib1.dll" />-->
   </ItemGroup>
   <ItemGroup />
   <!--<ItemGroup>

diff --git a/Unigram/Unigram/ViewModels/Chats/ChatSharedMediaViewModel.cs b/Unigram/Unigram/ViewModels/Chats/ChatSharedMediaViewModel.cs
@@ -59,12 +59,14 @@ public override async Task OnNavigatedToAsync(object parameter, NavigationMode m
             Links = new MediaCollection(ProtoService, chatId, new SearchMessagesFilterUrl());
             Music = new MediaCollection(ProtoService, chatId, new SearchMessagesFilterAudio());
             Voice = new MediaCollection(ProtoService, chatId, new SearchMessagesFilterVoiceNote());
+            Animations = new MediaCollection(ProtoService, chatId, new SearchMessagesFilterAnimation());
 
             RaisePropertyChanged(nameof(Media));
             RaisePropertyChanged(nameof(Files));
             RaisePropertyChanged(nameof(Links));
             RaisePropertyChanged(nameof(Music));
             RaisePropertyChanged(nameof(Voice));
+            RaisePropertyChanged(nameof(Animations));
 
             Aggregator.Subscribe(this);
 
@@ -86,7 +88,8 @@ private async Task UpdateSharedCountAsync(long chatId)
                 new SearchMessagesFilterDocument(),
                 new SearchMessagesFilterUrl(),
                 new SearchMessagesFilterAudio(),
-                new SearchMessagesFilterVoiceNote()
+                new SearchMessagesFilterVoiceNote(),
+                new SearchMessagesFilterAnimation(),
             };
 
             for (int i = 0; i < filters.Length; i++)
@@ -98,6 +101,8 @@ private async Task UpdateSharedCountAsync(long chatId)
                 }
             }
 
+            SharedCount[SharedCount.Length - 1] = 0;
+
             RaisePropertyChanged(nameof(SharedCount));
         }
 
@@ -125,6 +130,7 @@ public void Handle(UpdateDeleteMessages update)
                     UpdateDeleteMessages(Links, table);
                     UpdateDeleteMessages(Music, table);
                     UpdateDeleteMessages(Voice, table);
+                    UpdateDeleteMessages(Animations, table);
                 });
             }
         }
@@ -161,6 +167,7 @@ public int SelectedIndex
         public MediaCollection Links { get; private set; }
         public MediaCollection Music { get; private set; }
         public MediaCollection Voice { get; private set; }
+        public MediaCollection Animations { get; private set; }
 
         public void Find(SearchMessagesFilter filter, string query)
         {
@@ -186,6 +193,10 @@ public void Find(SearchMessagesFilter filter, string query)
                     Voice = new MediaCollection(ProtoService, Chat.Id, voiceNote, query);
                     RaisePropertyChanged(nameof(Voice));
                     break;
+                case SearchMessagesFilterAnimation animation:
+                    Animations = new MediaCollection(ProtoService, Chat.Id, animation, query);
+                    RaisePropertyChanged(nameof(Animations));
+                    break;
             }
         }
 

diff --git a/Unigram/Unigram/Views/Chats/ChatSharedMediaPage.xaml.cs b/Unigram/Unigram/Views/Chats/ChatSharedMediaPage.xaml.cs
@@ -15,6 +15,16 @@ public ChatSharedMediaPage()
             DataContext = View.DataContext = TLContainer.Current.Resolve<ChatSharedMediaViewModel, IFileDelegate>(View);
         }
 
+        public void NavigatedTo(NavigationEventArgs e)
+        {
+            View.OnNavigatedTo(e);
+        }
+
+        public void NavigatedFrom(NavigationEventArgs e)
+        {
+            View.OnNavigatedFrom(e);
+        }
+
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
             View.OnNavigatedTo(e);