Microsoft.UI.Xaml 2.3

hocgia · Dec 9, 2019 · e3d0dae · e3d0dae
1 parent bee559d
commit e3d0dae
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 17 deletions.
diff --git a/Unigram/Unigram/Themes/Fluent.cs b/Unigram/Unigram/Themes/Fluent.cs
@@ -53,7 +53,7 @@ public Fluent()
             else
             {
                 // We don't want any kind of fluent effect prior to Fall Creators Update (so fluent will affect PCs only)
-                MergedDictionaries.Add(new ResourceDictionary { Source = new Uri("ms-appx://Microsoft.UI.Xaml.2.2/Microsoft.UI.Xaml/Themes/rs2_themeresources.xaml") });
+                MergedDictionaries.Add(new ResourceDictionary { Source = new Uri("ms-appx://Microsoft.UI.Xaml.2.3/Microsoft.UI.Xaml/Themes/rs2_themeresources.xaml") });
                 this["NavigationViewTopPaneHeight"] = 48d;
             }
         }

diff --git a/Unigram/Unigram/Unigram.csproj b/Unigram/Unigram/Unigram.csproj
@@ -2665,7 +2665,7 @@
       <Version>4.0.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.2.190917002</Version>
+      <Version>2.3.191129002</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml.Core.Direct">
       <Version>2.0.180924001-prerelease</Version>

diff --git a/Unigram/Unigram/Views/Chats/ChatSharedMediaPage.xaml b/Unigram/Unigram/Views/Chats/ChatSharedMediaPage.xaml
@@ -75,7 +75,7 @@
                         </GridView.Header>
                         <GridView.Footer>
                             <!--<Border Height="8"/>-->
-                            <ProgressBar Background="Transparent" IsIndeterminate="{x:Bind ViewModel.Media.IsLoading, Mode=OneWay}"/>
+                            <microsoft:ProgressBar Background="Transparent" IsIndeterminate="{x:Bind ViewModel.Media.IsLoading, Mode=OneWay}"/>
                         </GridView.Footer>
                         <GridView.ItemTemplateSelector>
                             <selectors:MessageContentTemplateSelector>
@@ -145,7 +145,7 @@
                         </ListView.Header>
                         <ListView.Footer>
                             <!--<Border Height="8"/>-->
-                            <ProgressBar Background="Transparent" IsIndeterminate="{x:Bind ViewModel.Files.IsLoading, Mode=OneWay}"/>
+                            <microsoft:ProgressBar Background="Transparent" IsIndeterminate="{x:Bind ViewModel.Files.IsLoading, Mode=OneWay}"/>
                         </ListView.Footer>
                         <ListView.ItemTemplateSelector>
                             <selectors:MessageContentTemplateSelector>
@@ -194,7 +194,7 @@
                         </ListView.Header>
                         <ListView.Footer>
                             <!--<Border Height="8"/>-->
-                            <ProgressBar Background="Transparent" IsIndeterminate="{x:Bind ViewModel.Links.IsLoading, Mode=OneWay}"/>
+                            <microsoft:ProgressBar Background="Transparent" IsIndeterminate="{x:Bind ViewModel.Links.IsLoading, Mode=OneWay}"/>
                         </ListView.Footer>
                         <ListView.ItemTemplateSelector>
                             <selectors:MessageContentTemplateSelector>
@@ -243,7 +243,7 @@
                         </ListView.Header>
                         <ListView.Footer>
                             <!--<Border Height="8"/>-->
-                            <ProgressBar Background="Transparent" IsIndeterminate="{x:Bind ViewModel.Music.IsLoading, Mode=OneWay}"/>
+                            <microsoft:ProgressBar Background="Transparent" IsIndeterminate="{x:Bind ViewModel.Music.IsLoading, Mode=OneWay}"/>
                         </ListView.Footer>
                         <ListView.ItemTemplateSelector>
                             <selectors:MessageContentTemplateSelector>
@@ -292,7 +292,7 @@
                         </ListView.Header>
                         <ListView.Footer>
                             <!--<Border Height="8"/>-->
-                            <ProgressBar Background="Transparent" IsIndeterminate="{x:Bind ViewModel.Voice.IsLoading, Mode=OneWay}"/>
+                            <microsoft:ProgressBar Background="Transparent" IsIndeterminate="{x:Bind ViewModel.Voice.IsLoading, Mode=OneWay}"/>
                         </ListView.Footer>
                         <ListView.ItemTemplateSelector>
                             <selectors:MessageContentTemplateSelector>

diff --git a/Unigram/Unigram/Views/InstantPage.xaml b/Unigram/Unigram/Views/InstantPage.xaml
@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:Unigram.Views"
     xmlns:controls="using:Unigram.Controls"
+    xmlns:microsoft="using:Microsoft.UI.Xaml.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
@@ -176,7 +177,7 @@
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
-                <ProgressBar x:Name="Reading" VerticalAlignment="Stretch" Background="Transparent" Foreground="{ThemeResource SystemControlBackgroundBaseLowBrush}" Grid.ColumnSpan="3"/>
+                <microsoft:ProgressBar x:Name="Reading" VerticalAlignment="Stretch" Background="Transparent" Foreground="{ThemeResource SystemControlBackgroundBaseLowBrush}" Grid.ColumnSpan="3"/>
 
                 <TextBlock Text="{x:Bind ViewModel.Title, Mode=OneWay}"
                            VerticalAlignment="Center"

diff --git a/Unigram/Unigram/Views/MainPage.xaml b/Unigram/Unigram/Views/MainPage.xaml
@@ -11,6 +11,7 @@
     xmlns:chats="using:Unigram.Controls.Chats"
     xmlns:viewModels="using:Unigram.ViewModels"
     xmlns:messages="using:Unigram.Controls.Messages"
+    xmlns:microsoft="using:Microsoft.UI.Xaml.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:triggers="using:Unigram.Triggers"
@@ -89,7 +90,7 @@
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition/>
                 </Grid.ColumnDefinitions>
-                <ProgressBar x:Name="Status" VerticalAlignment="Top" Background="Transparent" Grid.ColumnSpan="2"/>
+                <microsoft:ProgressBar x:Name="Status" VerticalAlignment="Top" Background="Transparent" Grid.ColumnSpan="2"/>
                 <TextBlock x:Name="StatusLabel"
                            VerticalAlignment="Center"
                            TextLineBounds="TrimToCapHeight"

diff --git a/Unigram/Unigram/Views/Settings/Phone/SettingsPhonePage.xaml b/Unigram/Unigram/Views/Settings/Phone/SettingsPhonePage.xaml
@@ -6,6 +6,7 @@
     xmlns:cv="using:Unigram.Converters"
     xmlns:controls="using:Unigram.Controls"
     xmlns:models="using:Unigram.Entities"
+    xmlns:microsoft="using:Microsoft.UI.Xaml.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Loaded="OnLoaded"
@@ -81,7 +82,7 @@
                                        Grid.Column="1"/>
             </Grid>
 
-            <ProgressBar IsIndeterminate="{x:Bind ViewModel.IsLoading, Mode=OneWay}" Background="Transparent" Grid.Row="4"/>
+            <microsoft:ProgressBar IsIndeterminate="{x:Bind ViewModel.IsLoading, Mode=OneWay}" Background="Transparent" Grid.Row="4"/>
 
             <Button x:Name="NextButton"
                     Content="{CustomResource OK}"

diff --git a/Unigram/Unigram/Views/Settings/Phone/SettingsPhoneSentCodePage.xaml b/Unigram/Unigram/Views/Settings/Phone/SettingsPhoneSentCodePage.xaml
@@ -5,6 +5,7 @@
     xmlns:local="using:Unigram.Views"
     xmlns:common="using:Unigram.Common"
     xmlns:controls="using:Unigram.Controls"
+    xmlns:microsoft="using:Microsoft.UI.Xaml.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Loaded="OnLoaded"
@@ -51,7 +52,7 @@
                 PlaceholderText="{CustomResource Code}"
                 Grid.Row="3"/>
 
-            <ProgressBar IsIndeterminate="{x:Bind ViewModel.IsLoading, Mode=OneWay}" Background="Transparent" Grid.Row="4"/>
+            <microsoft:ProgressBar IsIndeterminate="{x:Bind ViewModel.IsLoading, Mode=OneWay}" Background="Transparent" Grid.Row="4"/>
 
             <Button x:Name="NextButton"
                     Content="{CustomResource OK}"

diff --git a/Unigram/Unigram/Views/Settings/SettingsNightModePage.xaml b/Unigram/Unigram/Views/Settings/SettingsNightModePage.xaml
@@ -5,6 +5,7 @@
     xmlns:local="using:Unigram.Views.Settings"
     xmlns:controls="using:Unigram.Controls"
     xmlns:settings="using:Unigram.Services.Settings"
+    xmlns:microsoft="using:Microsoft.UI.Xaml.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
@@ -105,7 +106,7 @@
                         <FontIcon Glyph="&#xEC8A;"/>
                         <FontIcon Glyph="&#xE706;" Grid.Column="2"/>
 
-                        <ProgressBar x:Name="Lux" Grid.Column="1"/>
+                        <microsoft:ProgressBar x:Name="Lux" Grid.Column="1"/>
                         <Slider Background="Transparent" Foreground="Transparent" Grid.Column="1"/>
                     </Grid>
 

diff --git a/Unigram/Unigram/Views/SignIn/SignInPage.xaml b/Unigram/Unigram/Views/SignIn/SignInPage.xaml
@@ -6,6 +6,7 @@
     xmlns:common="using:Unigram.Common"
     xmlns:controls="using:Unigram.Controls"
     xmlns:models="using:Unigram.Entities"
+    xmlns:microsoft="using:Microsoft.UI.Xaml.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Loaded="OnLoaded"
@@ -78,7 +79,7 @@
                     Grid.Column="1"/>
             </Grid>
 
-            <ProgressBar IsIndeterminate="{x:Bind ViewModel.IsLoading, Mode=OneWay}" Background="Transparent" Grid.Row="4"/>
+            <microsoft:ProgressBar IsIndeterminate="{x:Bind ViewModel.IsLoading, Mode=OneWay}" Background="Transparent" Grid.Row="4"/>
 
             <Button x:Name="NextButton"
                     Content="{CustomResource OK}"

diff --git a/Unigram/Unigram/Views/SignIn/SignInPasswordPage.xaml b/Unigram/Unigram/Views/SignIn/SignInPasswordPage.xaml
@@ -5,6 +5,7 @@
     xmlns:local="using:Unigram.Views"
     xmlns:common="using:Unigram.Common"
     xmlns:controls="using:Unigram.Controls"
+    xmlns:microsoft="using:Microsoft.UI.Xaml.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Loaded="OnLoaded"
@@ -43,7 +44,7 @@
                          KeyDown="PasswordBox_KeyDown"
                          Grid.Row="3"/>
 
-            <ProgressBar IsIndeterminate="{x:Bind ViewModel.IsLoading, Mode=OneWay}" Background="Transparent" Grid.Row="4"/>
+            <microsoft:ProgressBar IsIndeterminate="{x:Bind ViewModel.IsLoading, Mode=OneWay}" Background="Transparent" Grid.Row="4"/>
 
             <Button x:Name="NextButton"
                     Content="{CustomResource OK}"

diff --git a/Unigram/Unigram/Views/SignIn/SignInRecoveryPage.xaml b/Unigram/Unigram/Views/SignIn/SignInRecoveryPage.xaml
@@ -5,6 +5,7 @@
     xmlns:local="using:Unigram.Views"
     xmlns:common="using:Unigram.Common"
     xmlns:controls="using:Unigram.Controls"
+    xmlns:microsoft="using:Microsoft.UI.Xaml.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Loaded="OnLoaded"
@@ -43,7 +44,7 @@
                          KeyDown="PasswordBox_KeyDown"
                          Grid.Row="3"/>
 
-            <ProgressBar IsIndeterminate="{x:Bind ViewModel.IsLoading, Mode=OneWay}" Background="Transparent" Grid.Row="4"/>
+            <microsoft:ProgressBar IsIndeterminate="{x:Bind ViewModel.IsLoading, Mode=OneWay}" Background="Transparent" Grid.Row="4"/>
 
             <Button x:Name="NextButton"
                     Content="{CustomResource OK}"

diff --git a/Unigram/Unigram/Views/SignIn/SignInSentCodePage.xaml b/Unigram/Unigram/Views/SignIn/SignInSentCodePage.xaml
@@ -5,6 +5,7 @@
     xmlns:local="using:Unigram.Views"
     xmlns:common="using:Unigram.Common"
     xmlns:controls="using:Unigram.Controls"
+    xmlns:microsoft="using:Microsoft.UI.Xaml.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Loaded="OnLoaded"
@@ -44,7 +45,7 @@
                 PlaceholderText="{CustomResource Code}"
                 Grid.Row="3"/>
 
-            <ProgressBar IsIndeterminate="{x:Bind ViewModel.IsLoading, Mode=OneWay}" Background="Transparent" Grid.Row="4"/>
+            <microsoft:ProgressBar IsIndeterminate="{x:Bind ViewModel.IsLoading, Mode=OneWay}" Background="Transparent" Grid.Row="4"/>
 
             <Button x:Name="NextButton"
                     Content="{CustomResource OK}"

diff --git a/Unigram/Unigram/Views/SignIn/SignUpPage.xaml b/Unigram/Unigram/Views/SignIn/SignUpPage.xaml
@@ -5,6 +5,7 @@
     xmlns:local="using:Unigram.Views.SignIn"
     xmlns:common="using:Unigram.Common"
     xmlns:controls="using:Unigram.Controls"
+    xmlns:microsoft="using:Microsoft.UI.Xaml.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
@@ -51,7 +52,7 @@
                 PlaceholderText="{CustomResource LastName}"
                 Grid.Row="4"/>
 
-            <ProgressBar IsIndeterminate="{x:Bind ViewModel.IsLoading, Mode=OneWay}" Background="Transparent" Grid.Row="5"/>
+            <microsoft:ProgressBar IsIndeterminate="{x:Bind ViewModel.IsLoading, Mode=OneWay}" Background="Transparent" Grid.Row="5"/>
 
             <Button x:Name="NextButton"
                     Content="{CustomResource OK}"