Added folder previews to the preview pane

Files/Strings/en-US/Resources.resw

@@ -1899,4 +1899,7 @@
     <data name="SettingsAppearanceColorScheme.Header" xml:space="preserve">
     <value>Color scheme</value>
   </data>
+  <data name="PropertyItemCount" xml:space="preserve">
+    <value>Item count</value>
+  </data>
 </root>

Files/UserControls/FilePreviews/FolderPreview.xaml

@@ -2,22 +2,14 @@
     x:Class="Files.UserControls.FilePreviews.FolderPreview"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Files.UserControls.FilePreviews"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-    xmlns:previews="using:Files.ViewModels.Previews"
+    mc:Ignorable="d"
     d:DesignHeight="300"
-    d:DesignWidth="400"
-    mc:Ignorable="d">
+    d:DesignWidth="400">
 
     <Grid>
-        <GridView ItemsSource="{x:Bind ViewModel.Contents}" SelectionMode="None">
-            <GridView.ItemTemplate>
-                <DataTemplate x:DataType="previews:FolderContent">
-                    <Image Width="40" Source="{x:Bind Image}" />
-                </DataTemplate>
-            </GridView.ItemTemplate>
-        </GridView>
+        <Image Source="{x:Bind Model.Thumbnail, Mode=OneWay}" />
     </Grid>
-</UserControl>
+</UserControl>

Files/UserControls/FilePreviews/FolderPreview.xaml.cs

@@ -1,18 +1,30 @@
 using Files.ViewModels.Previews;
+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 Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
 
 // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
 
 namespace Files.UserControls.FilePreviews
 {
     public sealed partial class FolderPreview : UserControl
     {
-        public FolderPreviewViewModel ViewModel { get; set; }
-
-        public FolderPreview(FolderPreviewViewModel viewModel)
+        public FolderPreviewViewModel Model { get; set; }
+        public FolderPreview(FolderPreviewViewModel model)
         {
-            ViewModel = viewModel;
+            Model = model;
             this.InitializeComponent();
         }
     }
-}
+}

Files/ViewModels/PreviewPaneViewModel.cs

@@ -98,11 +98,7 @@ private async Task LoadPreviewControlAsync()
 
             if (SelectedItem.PrimaryItemAttribute == StorageItemTypes.Folder)
             {
-                // TODO: Finish folder previews and reimplement later
-                //PreviewPaneContent = new FolderPreview(new FolderPreviewViewModel(SelectedItem));
-                DetailsErrorText = "PreviewPaneDetailsNotAvailableText".GetLocalized();
-                PreviewErrorText = "DetailsPanePreviewNotAvaliableText".GetLocalized();
-                PreviewPaneContent = null;
+                PreviewPaneContent = new FolderPreview(new FolderPreviewViewModel(SelectedItem));
                 return;
             }
 
@@ -127,7 +123,6 @@ private async Task LoadPreviewControlAsync()
             control = new BasicPreview(basicModel);
             PreviewPaneContent = control;
         }
-
         private async Task<UserControl> GetBuiltInPreviewControlAsync(ListedItem item)
         {
             if (item.IsShortcutItem)

Files/ViewModels/Previews/FolderPreviewViewModel.cs

@@ -1,8 +1,10 @@
 using Files.Filesystem;
+using Files.Helpers;
 using Files.ViewModels.Properties;
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Threading.Tasks;
 using Windows.Storage;
 using Windows.Storage.FileProperties;
 using Windows.UI.Xaml.Media.Imaging;
@@ -15,7 +17,7 @@ public class FolderPreviewViewModel
 
         public ListedItem Item { get; set; }
 
-        public ObservableCollection<FolderContent> Contents { get; set; } = new ObservableCollection<FolderContent>();
+        public BitmapImage Thumbnail { get; set; } = new BitmapImage();
 
         public FolderPreviewViewModel(ListedItem item)
         {
@@ -28,48 +30,38 @@ private async void LoadPreviewAndDetailsAsync()
             Folder = await StorageFolder.GetFolderFromPathAsync(Item.ItemPath);
             var items = await Folder.GetItemsAsync();
 
-            foreach (var item in items.Take(Constants.PreviewPane.FolderPreviewThumbnailCount))
-            {
-                if (item is StorageFile)
-                {
-                    var icon = await (item as StorageFile).GetThumbnailAsync(ThumbnailMode.SingleItem, 80, ThumbnailOptions.UseCurrentScale);
-                    var imageSource = new BitmapImage();
-                    if (icon != null)
-                    {
-                        await imageSource.SetSourceAsync(icon);
-                    }
-
-                    Contents.Add(new FolderContent
-                    {
-                        Image = imageSource
-                    });
-                }
-            }
+            using var icon = await Folder.GetThumbnailAsync(ThumbnailMode.SingleItem, 400);
+            await Thumbnail.SetSourceAsync(icon);
 
             var info = await Folder.GetBasicPropertiesAsync();
             Item.FileDetails = new ObservableCollection<FileProperty>()
             {
                 new FileProperty()
                 {
-                    LocalizedName = "Item count",
+                    NameResource = "PropertyItemCount",
                     Value = items.Count,
                 },
                 new FileProperty()
                 {
-                    LocalizedName = "Date Modified",
+                    NameResource = "PropertyDateModified",
                     Value = info.DateModified,
                 },
                 new FileProperty()
                 {
-                    LocalizedName = "Date Created",
+                    NameResource = "PropertyDateCreated",
                     Value = info.ItemDate,
+                },
+                new FileProperty()
+                {
+                    NameResource = "PropertyItemName",
+                    Value = Folder.Name,
+                },
+                new FileProperty()
+                {
+                    NameResource = "PropertyItemPathDisplay",
+                    Value = Folder.Path,
                 }
             };
         }
     }
-
-    public struct FolderContent
-    {
-        public BitmapImage Image;
-    }
 }