Begin work for an "add item" experience

Author: lukeblevins

AddItem.xaml

@@ -6,25 +6,27 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
-    Background="{ThemeResource SystemControlAcrylicWindowBrush}" Loaded="Page_Loaded">
+    Background="{StaticResource ApplicationPageBackgroundThemeBrush}" Loaded="Page_Loaded">
 
-    <Grid Padding="25,50,25,0">
+    <Grid>
         <StackPanel Spacing="25" Orientation="Vertical">
             <Grid Name="HeaderArea">
                 <StackPanel>
                     <TextBlock Name="Heading" Text="Create New Item" FontSize="36" FontWeight="Bold"/>
                     <TextBlock Name="Description" Text="Choose a type below for this new item."/>
                 </StackPanel>
             </Grid>
-            <Grid Name="SelectionListContent" HorizontalAlignment="Left">
+            <Grid Name="SelectionListContent" HorizontalAlignment="Stretch">
                 <StackPanel>
                     <ListView IsItemClickEnabled="True" ItemClick="ListView_ItemClick" ItemsSource="{x:Bind local:AddItem.AddItemsList}">
                         <ListView.ItemTemplate>
                             <DataTemplate>
+                                <Grid Height="50">
                                     <StackPanel>
                                         <TextBlock Text="{Binding Header}"/>
                                         <TextBlock Foreground="Gray" Text="{Binding SubHeader}"/>
                                     </StackPanel>
+                                </Grid>
                             </DataTemplate>
                         </ListView.ItemTemplate>
                     </ListView>

AddItem.xaml.cs

@@ -20,11 +20,10 @@ public AddItem()
         public static void AddItemsToList()
         {
             AddItemsList.Clear();
-            AddItemsList.Add(new AddListItem { Header = "Folder", SubHeader = "Creates an empty folder.", isEnabled = true });
+            AddItemsList.Add(new AddListItem { Header = "Folder", SubHeader = "Creates an empty folder", isEnabled = true });
             AddItemsList.Add(new AddListItem { Header = "Text Document", SubHeader = "Creates a simple file for text input", isEnabled = true });
-            AddItemsList.Add(new AddListItem { Header = "Bitmap Image", SubHeader = "Creates an empty bitmap image file.", isEnabled = true });
-            AddItemsList.Add(new AddListItem { Header = "Shortcut", SubHeader = "In Development: Creates a shortcut to a different location.", isEnabled = false });
-            AddItemsList.Add(new AddListItem { Header = "Compressed Folder", SubHeader = "In Development: Creates a new compressed folder from an existing folder.", isEnabled = false });
+            AddItemsList.Add(new AddListItem { Header = "Bitmap Image", SubHeader = "Creates an empty bitmap image file", isEnabled = true });
+            
         }
 
 

GenericFileBrowser.xaml

@@ -191,8 +191,12 @@
 
 
             </Grid>
-
-            <ContentDialog  PrimaryButtonText="Replace" SecondaryButtonText="Skip" Title="{x:Bind local2:ItemViewModel.ConflictBoxHeader.Header, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Name="ReviewBox" Grid.RowSpan="4">
+            
+            <ContentDialog  BorderThickness="0" Name="AddDialog" PrimaryButtonText="Cancel" Loaded="ContentDialog_Loaded" Grid.RowSpan="4">
+                <Frame Width="450" Height="500" Name="AddDialogFrame"/>
+            </ContentDialog>
+            
+            <ContentDialog PrimaryButtonText="Replace" SecondaryButtonText="Skip" Title="{x:Bind local2:ItemViewModel.ConflictBoxHeader.Header, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Name="ReviewBox" Grid.RowSpan="4">
                 <Grid>
                     <TextBlock Name="ConflictSmallHeader" TextWrapping="WrapWholeWords" Text="{x:Bind local2:ItemViewModel.ConflictBoxSubHeader.SubHeader, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" VerticalAlignment="Center"/>
                 </Grid>

GenericFileBrowser.xaml.cs

@@ -13,6 +13,7 @@
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Media.Animation;
 using Windows.UI.Xaml.Navigation;
 
 namespace Files
@@ -73,20 +74,21 @@ public GenericFileBrowser()
 
         private async void AddItem_ClickAsync(object sender, RoutedEventArgs e)
         {
-            var CurrentView = ApplicationView.GetForCurrentView();
-            CoreApplicationView NewView = CoreApplication.CreateNewView();
-
-            await NewView.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
-            {
-                var newWindow = Window.Current;
-                var newAppView = ApplicationView.GetForCurrentView();
-                Frame frame = new Frame();
-                frame.Navigate(typeof(AddItem), null);
-                Window.Current.Content = frame;
-                Window.Current.Activate();
-                await ApplicationViewSwitcher.TryShowAsStandaloneAsync(newAppView.Id, ViewSizePreference.Default, CurrentView.Id, ViewSizePreference.Default);
-
-            });
+            await AddDialog.ShowAsync();
+            //var CurrentView = ApplicationView.GetForCurrentView();
+            //CoreApplicationView NewView = CoreApplication.CreateNewView();
+
+            //await NewView.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
+            //{
+            //    var newWindow = Window.Current;
+            //    var newAppView = ApplicationView.GetForCurrentView();
+            //    Frame frame = new Frame();
+            //    frame.Navigate(typeof(AddItem), null);
+            //    Window.Current.Content = frame;
+            //    Window.Current.Activate();
+            //    await ApplicationViewSwitcher.TryShowAsStandaloneAsync(newAppView.Id, ViewSizePreference.Default, CurrentView.Id, ViewSizePreference.Default);
+
+            //});
         }
 
         private void Clipboard_ContentChanged(object sender, object e)
@@ -208,7 +210,10 @@ private async void AllView_CellEditEnded(object sender, DataGridCellEditEndedEve
             }
         }
 
-        
+        private void ContentDialog_Loaded(object sender, RoutedEventArgs e)
+        {
+            AddDialogFrame.Navigate(typeof(AddItem), new SuppressNavigationTransitionInfo());
+        }
     }
 
     public class EmptyFolderTextState : INotifyPropertyChanged