Start Work on Properties Dialog

lukeblevins · lukeblevins · commit 5626ac1486b5 · 2019-04-19T20:53:19.000-04:00
diff --git a/Files UWP/AddItem.xaml b/Files UWP/AddItem.xaml
@@ -18,7 +18,7 @@
             </Grid>
             <Grid Name="SelectionListContent" HorizontalAlignment="Stretch">
                 <StackPanel>
-                    <ListView IsItemClickEnabled="True" ItemClick="ListView_ItemClick" ItemsSource="{x:Bind local:AddItem.AddItemsList}">
+                    <ListView Name="AddItemsListView" IsItemClickEnabled="True" ItemClick="ListView_ItemClick" ItemsSource="{x:Bind local:AddItem.AddItemsList}">
                         <ListView.ItemTemplate>
                             <DataTemplate>
                                 <Grid Height="50">
diff --git a/Files UWP/AddItem.xaml.cs b/Files UWP/AddItem.xaml.cs
@@ -12,9 +12,11 @@ namespace Files
 
     public sealed partial class AddItem : Page
     {
+        public static ListView addItemsChoices;
         public AddItem()
         {
             this.InitializeComponent();
+            addItemsChoices = AddItemsListView;
             AddItemsToList();
         }
 
@@ -33,13 +35,13 @@ public static void AddItemsToList()
         private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
         {
 
-            GenericFileBrowser.AddItemBox.Hide();
+            ProHome.AddItemBox.Hide();
             var currentPath = App.ViewModel.Universal.path;
             StorageFolder folderToCreateItem = await StorageFolder.GetFolderFromPathAsync(currentPath);
             if ((e.ClickedItem as AddListItem).Header == "Folder")
             {
-                await GenericFileBrowser.NameBox.ShowAsync();
-                var userInput = GenericFileBrowser.inputForRename;
+                await ProHome.NameBox.ShowAsync();
+                var userInput = ProHome.inputForRename;
                 if (userInput != null)
                 {
                     var folder = await folderToCreateItem.CreateFolderAsync(userInput, CreationCollisionOption.FailIfExists);
@@ -48,8 +50,8 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
             }
             else if ((e.ClickedItem as AddListItem).Header == "Text Document")
             {
-                await GenericFileBrowser.NameBox.ShowAsync();
-                var userInput = GenericFileBrowser.inputForRename;
+                await ProHome.NameBox.ShowAsync();
+                var userInput = ProHome.inputForRename;
                 if (userInput != null)
                 {
                     var folder = await folderToCreateItem.CreateFileAsync(userInput + ".txt", CreationCollisionOption.FailIfExists);
@@ -58,8 +60,8 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
             }
             else if ((e.ClickedItem as AddListItem).Header == "Bitmap Image")
             {
-                await GenericFileBrowser.NameBox.ShowAsync();
-                var userInput = GenericFileBrowser.inputForRename;
+                await ProHome.NameBox.ShowAsync();
+                var userInput = ProHome.inputForRename;
                 if (userInput != null)
                 {
                     var folder = await folderToCreateItem.CreateFileAsync(userInput + ".bmp", CreationCollisionOption.FailIfExists);
diff --git a/Files UWP/FilesUWP.csproj b/Files UWP/FilesUWP.csproj
@@ -134,6 +134,9 @@
     <Compile Include="ProHome.xaml.cs">
       <DependentUpon>ProHome.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Properties.xaml.cs">
+      <DependentUpon>Properties.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Settings.xaml.cs">
       <DependentUpon>Settings.xaml</DependentUpon>
@@ -194,6 +197,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Properties.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Settings.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -241,7 +248,7 @@
       <Version>5.1.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.1.190405004</Version>
+      <Version>2.1.190405004.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Files UWP/Interacts/Interaction.cs b/Files UWP/Interacts/Interaction.cs
@@ -552,7 +552,9 @@ public static async void DeleteItem_Click(object sender, RoutedEventArgs e)
 
         public static async void RenameItem_Click(object sender, RoutedEventArgs e)
         {
-            if(page.Name == "GenericItemView")
+            ProHome.inputFromRename.Text = "";
+
+            if (page.Name == "GenericItemView")
             {
                 try
                 {
diff --git a/Files UWP/ProHome.xaml b/Files UWP/ProHome.xaml
@@ -13,7 +13,8 @@
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
     xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
     xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
-    xmlns:Windows10version1809="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 7)">
+    xmlns:Windows10version1809="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 7)"
+    xmlns:Windows10version1903="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 8)">
     <Page.Resources>
         <Style x:Key="ListViewHeaderItemStyle1" TargetType="ListViewHeaderItem">
             <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/>
@@ -905,9 +906,9 @@
                                         <AppBarSeparator/>
                                         <AppBarButton Click="DeleteButton_Click" Name="DeleteButton" IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Delete" Icon="Delete"/>
                                         <AppBarButton Click="RenameButton_Click" Name="RenameButton" IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Rename" Icon="Rename"/>
-                                        <AppBarButton Click="AddItem_Click" Name="AddItem" IsEnabled="{x:Bind local:App.AlwaysPresentCommands.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Add Item" Icon="Add"/>
+                                        <AppBarButton Click="AddItem_Click" Name="addItemButton" IsEnabled="{x:Bind local:App.AlwaysPresentCommands.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Add Item" Icon="Add"/>
                                         <AppBarSeparator/>
-                                        <AppBarButton IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Properties">
+                                        <AppBarButton Click="ShowPropertiesButton_Click" Name="ShowPropertiesButton" IsEnabled="{x:Bind local:App.HomeItems.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Label="Properties">
                                             <AppBarButton.Icon>
                                                 <FontIcon Glyph="&#xE946;"/>
                                             </AppBarButton.Icon>
@@ -1088,19 +1089,34 @@
             <Frame Background="{StaticResource ApplicationPageBackgroundThemeBrush}" Name="ItemDisplayFrame"/>
 
         </SplitView>
-        <ContentDialog DefaultButton="Primary" PrimaryButtonClick="PermissionDialog_PrimaryButtonClick" PrimaryButtonText="Grant Permission" Name="PermissionDialog" Title="Welcome to Files UWP">
+        <ContentDialog Grid.RowSpan="4" DefaultButton="Primary" PrimaryButtonClick="PermissionDialog_PrimaryButtonClick" PrimaryButtonText="Grant Permission" Name="PermissionDialog" Title="Welcome to Files UWP">
+            <Windows10version1903:ContentDialog.Shadow>
+                <Windows10version1903:ThemeShadow/>
+            </Windows10version1903:ContentDialog.Shadow>
             <Grid>
                 <TextBlock TextWrapping="WrapWholeWords" Text="To get started, we need you to grant us permission to show you your files. This will open a Settings page where you can grant us permission. Files will close in the process, so don't be afraid to come back! "/>
             </Grid>
         </ContentDialog>
-        <ContentDialog Background="{StaticResource ApplicationPageBackgroundThemeBrush}" BorderThickness="0" Name="AddDialog" PrimaryButtonText="Cancel">
+        <ContentDialog Grid.RowSpan="4" Loaded="AddDialog_Loaded" Background="{StaticResource ApplicationPageBackgroundThemeBrush}" BorderThickness="0" Name="AddDialog" PrimaryButtonText="Cancel">
+            <Windows10version1903:ContentDialog.Shadow>
+                <Windows10version1903:ThemeShadow/>
+            </Windows10version1903:ContentDialog.Shadow>
             <Frame Width="450" Name="AddDialogFrame"/>
         </ContentDialog>
-        <ContentDialog Background="{StaticResource ApplicationPageBackgroundThemeBrush}" DefaultButton="Primary" Title="Name this item" BorderThickness="0" PrimaryButtonClick="NameDialog_PrimaryButtonClick" Name="NameDialog" PrimaryButtonText="Set Name" SecondaryButtonText="Cancel">
+        <ContentDialog Grid.RowSpan="4" Background="{StaticResource ApplicationPageBackgroundThemeBrush}" DefaultButton="Primary" Title="Name this item" BorderThickness="0" SecondaryButtonClick="NameDialog_SecondaryButtonClick" PrimaryButtonClick="NameDialog_PrimaryButtonClick" Name="NameDialog" PrimaryButtonText="Set Name" SecondaryButtonText="Cancel">
+            <Windows10version1903:ContentDialog.Shadow>
+                <Windows10version1903:ThemeShadow/>
+            </Windows10version1903:ContentDialog.Shadow>
             <Grid>
                 <TextBox Padding="8" Name="RenameInput" PlaceholderText="Enter an item name without the file extension" Width="300"/>
             </Grid>
         </ContentDialog>
+        <ContentDialog Name="PropertiesDialog" Grid.RowSpan="4" CloseButtonText="Cancel" PrimaryButtonText="OK" DefaultButton="Primary" SecondaryButtonText="Apply">
+            <Windows10version1903:ContentDialog.Shadow>
+                <Windows10version1903:ThemeShadow/>
+            </Windows10version1903:ContentDialog.Shadow>
+            <Frame Width="400" Height="450" Name="propertiesFrame" />
+        </ContentDialog>
 
     </Grid>
 </Page>
diff --git a/Files UWP/ProHome.xaml.cs b/Files UWP/ProHome.xaml.cs
@@ -1,4 +1,5 @@
-﻿using Files.Interacts;
+﻿using Files.Filesystem;
+using Files.Interacts;
 using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Collections.ObjectModel;
@@ -12,8 +13,10 @@
 using Windows.UI;
 using Windows.UI.Popups;
 using Windows.UI.ViewManagement;
+using Windows.UI.WindowManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Hosting;
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Media.Animation;
@@ -66,7 +69,7 @@ public ProHome()
             BackButton = Back;
             ForwardButton = Forward;
             RefreshButton = Refresh;
-            AddItemButton = AddItem;
+            AddItemButton = addItemButton;
             LocationsList.SelectedIndex = 0;
             if (App.Current.RequestedTheme == ApplicationTheme.Dark)
             {
@@ -655,6 +658,7 @@ private void RenameButton_Click(object sender, RoutedEventArgs e)
 
         private async void AddItem_Click(object sender, RoutedEventArgs e)
         {
+            AddItem.addItemsChoices.SelectedItem = null;
             await ProHome.AddItemBox.ShowAsync();
         }
 
@@ -682,5 +686,30 @@ private void ClearAllButton_Click(object sender, RoutedEventArgs e)
         {
 
         }
+
+        private void AddDialog_Loaded(object sender, RoutedEventArgs e)
+        {
+            AddDialogFrame.Navigate(typeof(AddItem), new SuppressNavigationTransitionInfo());
+        }
+
+        private void NameDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+        {
+            inputForRename = null;
+        }
+
+        private async void ShowPropertiesButton_Click(object sender, RoutedEventArgs e)
+        {
+
+            if (Interaction.page.Name == "GenericItemView")
+            {
+                propertiesFrame.Navigate(typeof(Properties), (GenericFileBrowser.data.SelectedItem as ListedItem).FilePath, new SuppressNavigationTransitionInfo());
+            }
+            else if (Interaction.page.Name == "PhotoAlbumViewer")
+            {
+                propertiesFrame.Navigate(typeof(Properties), (PhotoAlbum.gv.SelectedItem as ListedItem).FilePath, new SuppressNavigationTransitionInfo());
+            }
+            await PropertiesDialog.ShowAsync();
+
+        }
     }
 }
diff --git a/Files UWP/Properties.xaml b/Files UWP/Properties.xaml
@@ -0,0 +1,41 @@
+﻿<Page
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Files"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:Custom="using:Microsoft.Toolkit.Uwp.UI.Controls"
+    x:Class="Files.Properties"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="15*"/>
+            <RowDefinition Height="85*"/>
+        </Grid.RowDefinitions>
+
+        <Custom:TabView Background="White" CanCloseTabs="False" TabWidthBehavior="Equal" Grid.Row="0">
+            <Custom:TabViewItem Background="White" Header="Info">
+                <Custom:TabViewItem.Icon>
+                    <FontIcon Glyph="&#xE946;"/>
+                </Custom:TabViewItem.Icon>
+            </Custom:TabViewItem>
+            <Custom:TabViewItem Background="White" Header="Details">
+                <Custom:TabViewItem.Icon>
+                    <FontIcon Glyph="&#xEA37;"/>
+                </Custom:TabViewItem.Icon>
+            </Custom:TabViewItem>
+            <Custom:TabViewItem Background="White" Visibility="Collapsed" Header="Security">
+                <Custom:TabViewItem.Icon>
+                    <FontIcon Glyph="&#xE8A6;"/>
+                </Custom:TabViewItem.Icon>
+            </Custom:TabViewItem>
+        </Custom:TabView>
+
+        <Grid Grid.Row="1" >
+            <Frame Name="PropertiesTabContentFrame"/>
+        </Grid>
+
+    </Grid>
+</Page>
diff --git a/Files UWP/Properties.xaml.cs b/Files UWP/Properties.xaml.cs
@@ -0,0 +1,45 @@
+﻿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 Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace Files
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class Properties : Page
+    {
+        public Properties()
+        {
+            this.InitializeComponent();
+        }
+
+        private void OK_Button_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void Cancel_Button_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void Apply_Button_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+}
diff --git a/Files UWP/YourHome.xaml b/Files UWP/YourHome.xaml
diff --git a/Files UWP/YourHome.xaml.cs b/Files UWP/YourHome.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,11 @@ namespace Files`
`12`	`12`
`13`	`13`	`public sealed partial class AddItem : Page`
`14`	`14`	`{`
	`15`	`+ public static ListView addItemsChoices;`
`15`	`16`	`public AddItem()`
`16`	`17`	`{`
`17`	`18`	`this.InitializeComponent();`
	`19`	`+ addItemsChoices = AddItemsListView;`
`18`	`20`	`AddItemsToList();`
`19`	`21`	`}`
`20`	`22`
`@@ -33,13 +35,13 @@ public static void AddItemsToList()`
`33`	`35`	`private async void ListView_ItemClick(object sender, ItemClickEventArgs e)`
`34`	`36`	`{`
`35`	`37`
`36`		`- GenericFileBrowser.AddItemBox.Hide();`
	`38`	`+ ProHome.AddItemBox.Hide();`
`37`	`39`	`var currentPath = App.ViewModel.Universal.path;`
`38`	`40`	`StorageFolder folderToCreateItem = await StorageFolder.GetFolderFromPathAsync(currentPath);`
`39`	`41`	`if ((e.ClickedItem as AddListItem).Header == "Folder")`
`40`	`42`	`{`
`41`		`- await GenericFileBrowser.NameBox.ShowAsync();`
`42`		`- var userInput = GenericFileBrowser.inputForRename;`
	`43`	`+ await ProHome.NameBox.ShowAsync();`
	`44`	`+ var userInput = ProHome.inputForRename;`
`43`	`45`	`if (userInput != null)`
`44`	`46`	`{`
`45`	`47`	`var folder = await folderToCreateItem.CreateFolderAsync(userInput, CreationCollisionOption.FailIfExists);`
`@@ -48,8 +50,8 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)`
`48`	`50`	`}`
`49`	`51`	`else if ((e.ClickedItem as AddListItem).Header == "Text Document")`
`50`	`52`	`{`
`51`		`- await GenericFileBrowser.NameBox.ShowAsync();`
`52`		`- var userInput = GenericFileBrowser.inputForRename;`
	`53`	`+ await ProHome.NameBox.ShowAsync();`
	`54`	`+ var userInput = ProHome.inputForRename;`
`53`	`55`	`if (userInput != null)`
`54`	`56`	`{`
`55`	`57`	`var folder = await folderToCreateItem.CreateFileAsync(userInput + ".txt", CreationCollisionOption.FailIfExists);`
`@@ -58,8 +60,8 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)`
`58`	`60`	`}`
`59`	`61`	`else if ((e.ClickedItem as AddListItem).Header == "Bitmap Image")`
`60`	`62`	`{`
`61`		`- await GenericFileBrowser.NameBox.ShowAsync();`
`62`		`- var userInput = GenericFileBrowser.inputForRename;`
	`63`	`+ await ProHome.NameBox.ShowAsync();`
	`64`	`+ var userInput = ProHome.inputForRename;`
`63`	`65`	`if (userInput != null)`
`64`	`66`	`{`
`65`	`67`	`var folder = await folderToCreateItem.CreateFileAsync(userInput + ".bmp", CreationCollisionOption.FailIfExists);`
Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,9 @@ public static async void DeleteItem_Click(object sender, RoutedEventArgs e)`
`552`	`552`
`553`	`553`	`public static async void RenameItem_Click(object sender, RoutedEventArgs e)`
`554`	`554`	`{`
`555`		`- if(page.Name == "GenericItemView")`
	`555`	`+ ProHome.inputFromRename.Text = "";`
	`556`	`+`
	`557`	`+ if (page.Name == "GenericItemView")`
`556`	`558`	`{`
`557`	`559`	`try`
`558`	`560`	`{`