Switch to WinUI ProgressBar (#918)

Author: lukeblevins

Files/Files.csproj

@@ -220,7 +220,6 @@
     <Compile Include="UserControls\LayoutModes\GridViewBrowser.xaml.cs">
       <DependentUpon>GridViewBrowser.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Interacts\LoadingIndicator.cs" />
     <Compile Include="Views\Pages\ModernShellPage.xaml.cs">
       <DependentUpon>ModernShellPage.xaml</DependentUpon>
     </Compile>

Files/Interacts/Interaction.cs

@@ -1024,7 +1024,7 @@ public async void ExtractItems_Click(object sender, RoutedEventArgs e)
                 int totalCount = zipArchive.Entries.Count;
                 int index = 0;
 
-                (App.CurrentInstance.ContentPage as BaseLayout).AssociatedViewModel.LoadIndicator.IsVisible = Visibility.Visible;
+                App.InteractionViewModel.IsContentLoadingIndicatorVisible = true;
 
                 foreach (ZipArchiveEntry archiveEntry in zipArchive.Entries)
                 {
@@ -1042,7 +1042,7 @@ public async void ExtractItems_Click(object sender, RoutedEventArgs e)
                     index++;
                     if (index == totalCount)
                     {
-                        (App.CurrentInstance.ContentPage as BaseLayout).AssociatedViewModel.LoadIndicator.IsVisible = Visibility.Collapsed;
+                        App.InteractionViewModel.IsContentLoadingIndicatorVisible = false;
                     }
                 }
                 await CloneDirectoryAsync(destFolder_InBuffer.Path, destinationPath, destFolder_InBuffer.Name, true)

Files/Interacts/LoadingIndicator.cs

@@ -357,13 +357,12 @@
                 Invoked="{x:Bind local:App.CurrentInstance.ContentPage.GridViewSizeIncrease}"
                 Modifiers="Control" />
         </Grid.KeyboardAccelerators>
-        <ProgressBar
+        <muxc:ProgressBar
             x:Name="progBar"
-            Height="10"
-            VerticalAlignment="Top"
+            x:Load="{x:Bind local:App.InteractionViewModel.IsContentLoadingIndicatorVisible, Mode=OneWay}"
             Background="Transparent"
-            IsIndeterminate="True"
-            Visibility="{x:Bind AssociatedViewModel.LoadIndicator.IsVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+            VerticalAlignment="Top"
+            IsIndeterminate="True"/>
         <TextBlock
             x:Name="EmptyText"
             x:Uid="EmptyFolder"

Files/UserControls/LayoutModes/GenericFileBrowser.xaml

@@ -543,13 +543,12 @@
                 Invoked="{x:Bind local:App.CurrentInstance.ContentPage.GridViewSizeDecrease}"
                 Modifiers="Control" />
         </Grid.KeyboardAccelerators>
-        <ProgressBar
-            Name="ProgBar"
-            Height="10"
-            VerticalAlignment="Top"
+        <muxc:ProgressBar
+            x:Name="progBar"
+            x:Load="{x:Bind local:App.InteractionViewModel.IsContentLoadingIndicatorVisible, Mode=OneWay}"
             Background="Transparent"
-            IsIndeterminate="True"
-            Visibility="{x:Bind AssociatedViewModel.LoadIndicator.IsVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+            VerticalAlignment="Top"
+            IsIndeterminate="True"/>
         <TextBlock
             x:Name="EmptyText"
             x:Uid="EmptyFolder"

Files/UserControls/LayoutModes/GridViewBrowser.xaml

@@ -7,6 +7,13 @@ namespace Files.Controls
 {
     public class InteractionViewModel : ViewModelBase
     {
+        private bool _IsContentLoadingIndicatorVisible = false;
+        public bool IsContentLoadingIndicatorVisible
+        {
+            get => _IsContentLoadingIndicatorVisible;
+            set => Set(ref _IsContentLoadingIndicatorVisible, value);
+        }
+
         private Thickness _TabsLeftMargin = new Thickness(200, 0, 0, 0);
 
         public Thickness TabsLeftMargin

Files/View Models/InteractionViewModel.cs

@@ -37,7 +37,6 @@ namespace Files.Filesystem
     public class ItemViewModel : INotifyPropertyChanged, IDisposable
     {
         public EmptyFolderTextState EmptyTextState { get; set; } = new EmptyFolderTextState();
-        public LoadingIndicator LoadIndicator { get; set; } = new LoadingIndicator();
         public ReadOnlyObservableCollection<ListedItem> FilesAndFolders { get; }
         public ListedItem CurrentFolder { get => _rootFolderItem; }
         public CollectionViewSource viewSource;
@@ -699,7 +698,7 @@ public async Task RapidAddItemsToCollectionAsync(string path)
                 _filesAndFolders.Clear();
                 Stopwatch stopwatch = new Stopwatch();
                 stopwatch.Start();
-                LoadIndicator.IsVisible = Visibility.Visible;
+                App.InteractionViewModel.IsContentLoadingIndicatorVisible = true;
 
                 switch (WorkingDirectory)
                 {
@@ -769,7 +768,7 @@ public async Task RapidAddItemsToCollectionAsync(string path)
                 stopwatch.Stop();
                 Debug.WriteLine("Loading of items in " + WorkingDirectory + " completed in " + stopwatch.ElapsedMilliseconds + " milliseconds.\n");
                 App.CurrentInstance.NavigationToolbar.CanRefresh = true;
-                LoadIndicator.IsVisible = Visibility.Collapsed;
+                App.InteractionViewModel.IsContentLoadingIndicatorVisible = false;
                 IsLoadingItems = false;
             }
             finally
@@ -1281,7 +1280,7 @@ public async void FileContentsChanged(IStorageQueryResultBase sender, object arg
             await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal,
             () =>
             {
-                LoadIndicator.IsVisible = Visibility.Visible;
+                App.InteractionViewModel.IsContentLoadingIndicatorVisible = true;
             });
             _filesRefreshing = true;
 
@@ -1350,7 +1349,7 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio
             async () =>
             {
                 await RefreshItems();
-                LoadIndicator.IsVisible = Visibility.Collapsed;
+                App.InteractionViewModel.IsContentLoadingIndicatorVisible = false;
             });
 
             _filesRefreshing = false;