Display Indeterminate Progress Bar on Item Load/Refresh

Author: lukeblevins

Files UWP/App.xaml.cs

@@ -68,6 +68,7 @@ public App()
         public static Interacts.Layout.LayoutItemsState LayoutItems { get; set; } = new Interacts.Layout.LayoutItemsState();
         public static Interacts.AlwaysPresentCommandsState AlwaysPresentCommands { get; set; } = new Interacts.AlwaysPresentCommandsState();
         public static DisplayedPathText PathText { get; set; } = new DisplayedPathText();
+        public static Filesystem.LoadingVisibility Loading { get; set; } = new Filesystem.LoadingVisibility(); 
 
         /// <summary>
         /// Invoked when the application is launched normally by the end user.  Other entry points
@@ -76,6 +77,8 @@ public App()
         /// <param name="e">Details about the launch request and process.</param>
         protected override void OnLaunched(LaunchActivatedEventArgs e)
         {
+            bool canEnablePrelaunch = Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.ApplicationModel.Core.CoreApplication", "EnablePrelaunch");
+
             Frame rootFrame = Window.Current.Content as Frame;
 
             // Do not repeat app initialization when the Window already has content,
@@ -98,6 +101,11 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
 
             if (e.PrelaunchActivated == false)
             {
+                if (canEnablePrelaunch)
+                {
+                    TryEnablePrelaunch();
+                }
+
                 if (rootFrame.Content == null)
                 {
 
@@ -114,6 +122,10 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
             }
         }
 
+        private void TryEnablePrelaunch()
+        {
+            Windows.ApplicationModel.Core.CoreApplication.EnablePrelaunch(true);
+        }
         /// <summary>
         /// Invoked when Navigation to a certain page fails
         /// </summary>

Files UWP/FilesUWP.csproj

@@ -130,7 +130,7 @@
     <Compile Include="PhotoAlbum.xaml.cs">
       <DependentUpon>PhotoAlbum.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ProgressBoxSystem.cs" />
+    <Compile Include="LoadingIndicator.cs" />
     <Compile Include="ProHome.xaml.cs">
       <DependentUpon>ProHome.xaml</DependentUpon>
     </Compile>

Files UWP/Filesystem/ItemViewModel.cs

@@ -33,7 +33,6 @@ public class ItemViewModel
         public EmptyFolderTextState TextState { get; set; } = new EmptyFolderTextState();
         public BackState BS { get; set; } = new BackState();
         public ForwardState FS { get; set; } = new ForwardState();
-        public ProgressUIVisibility PVIS { get; set; } = new ProgressUIVisibility();
 
         private ObservableCollection<ListedItem> _filesAndFolders;
         private ObservableCollection<ListedItem> _classicFileList;
@@ -116,7 +115,7 @@ public async void AddItemsToCollectionAsync(string path, Page currentPage)
             Stopwatch stopwatch = new Stopwatch();
             stopwatch.Start();
 
-            PVIS.isVisible = Visibility.Visible;
+            App.Loading.isVisible = Visibility.Visible;
 
             switch (Universal.path)
             {
@@ -260,10 +259,10 @@ public async void AddItemsToCollectionAsync(string path, Page currentPage)
 
             if (!_pageName.Contains("Classic"))
             {
-                PVIS.isVisible = Visibility.Collapsed;
+                App.Loading.isVisible = Visibility.Collapsed;
             }
 
-            PVIS.isVisible = Visibility.Collapsed;
+            App.Loading.isVisible = Visibility.Collapsed;
         }
 
         public static async void FillTreeNode(object item, TreeView EntireControl)
@@ -439,6 +438,11 @@ private async void FileContentsChanged(IStorageQueryResultBase sender, object ar
                 Debug.WriteLine("Filesystem change event fired. Refreshing...");
             }
 
+            await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal,
+            () =>
+            {
+                App.Loading.isVisible = Visibility.Visible;
+            });
             _filesRefreshing = true;
 
             //query options have to be reapplied otherwise old results are returned
@@ -489,6 +493,13 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPrio
                     RemoveFileOrFolder(toRemove);
                 });
             }
+
+            await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal,
+            () =>
+            {
+                App.Loading.isVisible = Visibility.Collapsed;
+            });
+
             _filesRefreshing = false;
             Debug.WriteLine("Filesystem refresh complete");
         }

Files UWP/GenericFileBrowser.xaml

@@ -175,6 +175,7 @@
                 </MenuFlyout.Items>
             </MenuFlyout>
         </Grid.ContextFlyout>
+        <ProgressBar Visibility="{x:Bind local:App.Loading.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Height="10" VerticalAlignment="Top" IsIndeterminate="True"/>
         <TextBlock Name="EmptyText" Visibility="{x:Bind local:App.ViewModel.TextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0"/>
         <controls:DataGrid DataContext="{x:Bind local:App.ViewModel.FilesAndFolders}" RowDetailsVisibilityMode="Collapsed" AllowDrop="True" Drop="AllView_DropAsync" DragLeave="AllView_DragLeave" DragStarting="AllView_DragStarting" SelectionChanged="AllView_SelectionChanged" Margin="24,24,0,0" Grid.Row="3" CellEditEnded="AllView_CellEditEnded" FocusVisualPrimaryThickness="0" SelectionMode="Extended" IsDoubleTapEnabled="True" x:FieldModifier="public" x:Name="AllView" AutoGenerateColumns="False" CanDrag="True" DragOver="AllView_DragOver" IsRightTapEnabled="True" CanUserReorderColumns="False" IsReadOnly="True"  ItemsSource="{x:Bind local:App.ViewModel.FilesAndFolders}"  HorizontalAlignment="Left">
             <controls:DataGrid.ColumnHeaderStyle>

Files UWP/GenericFileBrowser.xaml.cs

@@ -36,7 +36,7 @@ public GenericFileBrowser()
             this.InitializeComponent();
             GFBPageName = GenericItemView;
             App.ViewModel.TextState.isVisible = Visibility.Collapsed;
-            App.ViewModel.PVIS.isVisible = Visibility.Collapsed;
+            App.Loading.isVisible = Visibility.Collapsed;
             data = AllView;
             context = RightClickContextMenu;
             HeaderContextMenu = HeaderRightClickMenu;
@@ -189,7 +189,7 @@ private async void AllView_DropAsync(object sender, DragEventArgs e)
 
         private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
         {
-            App.ViewModel.PVIS.isVisible = Visibility.Collapsed;
+            App.Loading.isVisible = Visibility.Collapsed;
         }
 
         private async void AllView_CellEditEnded(object sender, DataGridCellEditEndedEventArgs e)

Files UWP/LoadingIndicator.cs

@@ -0,0 +1,32 @@
+using System.ComponentModel;
+using Windows.UI.Xaml;
+
+namespace Files.Filesystem
+{
+    public class LoadingVisibility : INotifyPropertyChanged
+    {
+        public Visibility _isVisible;
+        public Visibility isVisible
+        {
+            get
+            {
+                return _isVisible;
+            }
+
+            set
+            {
+                if (value != _isVisible)
+                {
+                    _isVisible = value;
+                    NotifyPropertyChanged("isVisible");
+                }
+            }
+        }
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private void NotifyPropertyChanged(string info)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(info));
+        }
+    }
+}

Files UWP/PhotoAlbum.xaml

@@ -395,6 +395,7 @@
                 </MenuFlyout.Items>
             </MenuFlyout>
         </Grid.ContextFlyout>
+        <ProgressBar Visibility="{x:Bind local:App.Loading.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Height="10" VerticalAlignment="Top" IsIndeterminate="True"/>
         <TextBlock Name="EmptyText" Visibility="{x:Bind local:App.ViewModel.TextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0" Grid.Row="3" Canvas.ZIndex="0"/>
 
         <controls:AdaptiveGridView animations:ReorderGridAnimation.Duration="300" ShowsScrollingPlaceholders="True" Margin="24,24,24,0" Grid.Row="3" SelectionMode="Extended" IsDoubleTapEnabled="True" IsRightTapEnabled="True" ItemsSource="{x:Bind local:App.ViewModel.FilesAndFolders}" Name="FileList" Padding="0, 0, 0, 0" >