Skip to content

Commit e5c4b18

Browse files
lukeblevinslukeblevins
committed
Fix AddItem Not Reloading
1 parent 25f2c6e commit e5c4b18

File tree

5 files changed

+75
-48
lines changed

5 files changed

+75
-48
lines changed

‎AddItem.xaml.cs

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
using Windows.UI.Xaml.Controls;
55
using System;
66
using Files.Filesystem;
7+
using System.Collections.ObjectModel;
8+
using System.Threading.Tasks;
79

810
namespace Files
911
{
@@ -27,7 +29,7 @@ public static void AddItemsToList()
2729

2830
}
2931

30-
32+
3133
private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
3234
{
3335

@@ -36,18 +38,35 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
3638
StorageFolder folderToCreateItem = await StorageFolder.GetFolderFromPathAsync(currentPath);
3739
if ((e.ClickedItem as AddListItem).Header == "Folder")
3840
{
39-
await folderToCreateItem.CreateFolderAsync("New Folder", CreationCollisionOption.GenerateUniqueName);
41+
await GenericFileBrowser.NameBox.ShowAsync();
42+
var userInput = GenericFileBrowser.inputForRename;
43+
if (userInput != null)
44+
{
45+
await folderToCreateItem.CreateFolderAsync(userInput, CreationCollisionOption.FailIfExists);
46+
ItemViewModel.FilesAndFolders.Add(new ListedItem(){ FileName = userInput, FileDate = DateTime.Now.ToString(), EmptyImgVis = Visibility.Collapsed, FolderImg = Visibility.Visible, FileIconVis = Visibility.Collapsed, FileExtension = "Folder", FileImg = null, FilePath = (ItemViewModel.PUIP.Path + "\\" + userInput) });
47+
}
4048
}
41-
else if((e.ClickedItem as AddListItem).Header == "Text Document")
49+
else if ((e.ClickedItem as AddListItem).Header == "Text Document")
4250
{
43-
await folderToCreateItem.CreateFileAsync("New Text Document.txt", CreationCollisionOption.GenerateUniqueName);
51+
await GenericFileBrowser.NameBox.ShowAsync();
52+
var userInput = GenericFileBrowser.inputForRename;
53+
if (userInput != null)
54+
{
55+
await folderToCreateItem.CreateFileAsync(userInput + ".txt", CreationCollisionOption.FailIfExists);
56+
ItemViewModel.FilesAndFolders.Add(new ListedItem() { FileName = userInput, FileDate = DateTime.Now.ToString(), EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileExtension = "Text Document", FileImg = null, FilePath = (ItemViewModel.PUIP.Path + "\\" + userInput + ".txt") });
57+
}
4458
}
45-
else if((e.ClickedItem as AddListItem).Header == "Bitmap Image")
59+
else if ((e.ClickedItem as AddListItem).Header == "Bitmap Image")
4660
{
47-
await folderToCreateItem.CreateFileAsync("New Bitmap Image.bmp", CreationCollisionOption.GenerateUniqueName);
48-
}
49-
//Navigation.NavigationActions.Refresh_Click(null, null);
61+
await GenericFileBrowser.NameBox.ShowAsync();
62+
var userInput = GenericFileBrowser.inputForRename;
63+
if (userInput != null)
64+
{
65+
await folderToCreateItem.CreateFileAsync(userInput + ".bmp", CreationCollisionOption.FailIfExists);
66+
ItemViewModel.FilesAndFolders.Add(new ListedItem() { FileName = userInput, FileDate = DateTime.Now.ToString(), EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileExtension = "BMP File", FileImg = null, FilePath = (ItemViewModel.PUIP.Path + "\\" + userInput + ".bmp") });
5067

68+
}
69+
}
5170
}
5271

5372
private void Page_Loaded(object sender, RoutedEventArgs e)

‎GenericFileBrowser.xaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393

9494

9595

96-
<controls:DataGrid Margin="24,0,0,0" Grid.Row="3" CellEditEnded="AllView_CellEditEnded" FocusVisualPrimaryThickness="0" SelectionMode="Extended" IsDoubleTapEnabled="True" x:FieldModifier="public" x:Name="AllView" Drop="AllView_DropAsync" AutoGenerateColumns="False" CanDrag="False" AllowDrop="True" DragOver="AllView_DragOver" IsRightTapEnabled="True" CanUserReorderColumns="False" IsReadOnly="False" ItemsSource="{x:Bind local2:ItemViewModel.FilesAndFolders}" HorizontalAlignment="Left">
96+
<controls:DataGrid SelectionChanged="AllView_SelectionChanged" Margin="24,0,0,0" Grid.Row="3" CellEditEnded="AllView_CellEditEnded" FocusVisualPrimaryThickness="0" SelectionMode="Extended" IsDoubleTapEnabled="True" x:FieldModifier="public" x:Name="AllView" Drop="AllView_DropAsync" AutoGenerateColumns="False" CanDrag="False" AllowDrop="True" DragOver="AllView_DragOver" IsRightTapEnabled="True" CanUserReorderColumns="False" IsReadOnly="True" ItemsSource="{x:Bind local2:ItemViewModel.FilesAndFolders}" HorizontalAlignment="Left">
9797

9898
<controls:DataGrid.Resources>
9999
<MenuFlyout x:Name="HeaderRightClickMenu" x:Key="HeaderRightClickFlyout">
@@ -180,7 +180,7 @@
180180
</DataTemplate>
181181
</controls:DataGridTemplateColumn.CellTemplate>
182182
</controls:DataGridTemplateColumn>
183-
<controls:DataGridTextColumn Header="Name" IsReadOnly="False" Width="385" Binding="{Binding FileName}" Tag="Name"/>
183+
<controls:DataGridTextColumn IsReadOnly="True" Header="Name" Width="385" Binding="{Binding FileName}" Tag="Name"/>
184184
<controls:DataGridTextColumn IsReadOnly="True" Header="Date modified" Width="Auto" Binding="{Binding FileDate}" Tag="Date"/>
185185
<controls:DataGridTextColumn IsReadOnly="True" Header="Type" Width="150" Binding="{Binding FileExtension}" Tag="Type"/>
186186
<controls:DataGridTextColumn IsReadOnly="True" Header="Size" Binding="{Binding FileSize}" Tag="Size"/>
@@ -192,6 +192,12 @@
192192
<Frame Width="450" Name="AddDialogFrame"/>
193193
</ContentDialog>
194194

195+
<ContentDialog Title="Rename this item" BorderThickness="0" PrimaryButtonClick="NameDialog_PrimaryButtonClick" SecondaryButtonClick="NameDialog_SecondaryButtonClick" Name="NameDialog" PrimaryButtonText="Rename" SecondaryButtonText="Cancel" Loaded="NameDialog_Loaded" Grid.RowSpan="4">
196+
<Grid>
197+
<TextBox Name="RenameInput" PlaceholderText="Enter an item name (Ex: MyTextFile)"/>
198+
</Grid>
199+
</ContentDialog>
200+
195201
<ContentDialog PrimaryButtonText="Replace" SecondaryButtonText="Skip" Title="{x:Bind local2:ItemViewModel.ConflictBoxHeader.Header, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Name="ReviewBox" Grid.RowSpan="4">
196202
<Grid>
197203
<TextBlock Name="ConflictSmallHeader" TextWrapping="WrapWholeWords" Text="{x:Bind local2:ItemViewModel.ConflictBoxSubHeader.SubHeader, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" VerticalAlignment="Center"/>

‎GenericFileBrowser.xaml.cs

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Windows.UI.Xaml.Navigation;
1616
using Files.Filesystem;
1717
using Files.Navigation;
18+
using Files.Interacts;
1819

1920
namespace Files
2021
{
@@ -29,6 +30,10 @@ public sealed partial class GenericFileBrowser : Page
2930
public static ContentDialog collisionBox;
3031
public static ContentDialog reviewBox;
3132
public static ContentDialog AddItemBox;
33+
public static ContentDialog NameBox;
34+
public static TextBox inputFromRename;
35+
public static string inputForRename;
36+
3237

3338

3439
public GenericFileBrowser()
@@ -61,7 +66,7 @@ public GenericFileBrowser()
6166
AllView.RightTapped += Interacts.Interaction.AllView_RightTapped;
6267
Back.Click += Navigation.NavigationActions.Back_Click;
6368
Forward.Click += Navigation.NavigationActions.Forward_Click;
64-
Refresh.Click += Navigation.NavigationActions.Refresh_Click;
69+
Refresh.Click += NavigationActions.Refresh_Click;
6570
AddItem.Click += AddItem_ClickAsync;
6671
AllView.DoubleTapped += Interacts.Interaction.List_ItemClick;
6772
Paste.Click += Interacts.Interaction.PasteItem_ClickAsync;
@@ -70,6 +75,8 @@ public GenericFileBrowser()
7075
ReviewBox.PrimaryButtonClick += Interacts.Interaction.ReplaceChoiceClick;
7176
ReviewBox.SecondaryButtonClick += Interacts.Interaction.SkipChoiceClick;
7277
AddItemBox = AddDialog;
78+
NameBox = NameDialog;
79+
inputFromRename = RenameInput;
7380
}
7481

7582

@@ -199,6 +206,11 @@ private async void AllView_CellEditEnded(object sender, DataGridCellEditEndedEve
199206
if(FolderToRename.Name != newCellText)
200207
{
201208
await FolderToRename.RenameAsync(newCellText);
209+
AllView.CommitEdit();
210+
}
211+
else
212+
{
213+
AllView.CancelEdit();
202214
}
203215
}
204216
else
@@ -207,6 +219,11 @@ private async void AllView_CellEditEnded(object sender, DataGridCellEditEndedEve
207219
if (fileToRename.Name != newCellText)
208220
{
209221
await fileToRename.RenameAsync(newCellText);
222+
AllView.CommitEdit();
223+
}
224+
else
225+
{
226+
AllView.CancelEdit();
210227
}
211228
}
212229
//Navigation.NavigationActions.Refresh_Click(null, null);
@@ -222,6 +239,26 @@ private void GenericItemView_PointerReleased(object sender, Windows.UI.Xaml.Inpu
222239
data.CommitEdit();
223240
data.SelectedItems.Clear();
224241
}
242+
243+
private void AllView_SelectionChanged(object sender, SelectionChangedEventArgs e)
244+
{
245+
AllView.CommitEdit();
246+
}
247+
248+
private void NameDialog_Loaded(object sender, RoutedEventArgs e)
249+
{
250+
251+
}
252+
253+
private void NameDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
254+
{
255+
inputForRename = inputFromRename.Text;
256+
}
257+
258+
private void NameDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
259+
{
260+
261+
}
225262
}
226263

227264
public class EmptyFolderTextState : INotifyPropertyChanged

‎Interacts/Interaction.cs

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818

1919
namespace Files.Interacts
2020
{
21-
22-
23-
2421
public class Interaction
2522
{
2623

@@ -349,39 +346,6 @@ public static async void GrantAccessPermissionHandler(IUICommand command)
349346
await Launcher.LaunchUriAsync(new Uri("ms-settings:privacy-broadfilesystemaccess"));
350347
}
351348

352-
//public static async void PhotoAlbumItemList_ClickAsync(object sender, DoubleTappedRoutedEventArgs e)
353-
//{
354-
// GridView grid = sender as GridView;
355-
// var index = grid.Items.IndexOf(e.);
356-
// var clickedOnItem = ItemViewModel.FilesAndFolders[index];
357-
358-
// //Debug.WriteLine("Reached PhotoAlbumViewer event");
359-
360-
// if (clickedOnItem.FileExtension == "Folder")
361-
// {
362-
363-
// ItemViewModel.TextState.isVisible = Visibility.Collapsed;
364-
// History.ForwardList.Clear();
365-
// ItemViewModel.FS.isEnabled = false;
366-
// ItemViewModel.FilesAndFolders.Clear();
367-
// ItemViewModel.ViewModel = new ItemViewModel(clickedOnItem.FilePath, PhotoAlbum.PAPageName);
368-
// GenericFileBrowser.P.path = clickedOnItem.FilePath;
369-
370-
// }
371-
// else
372-
// {
373-
// StorageFile file = await StorageFile.GetFileFromPathAsync(clickedOnItem.FilePath);
374-
// var options = new LauncherOptions();
375-
// options.DisplayApplicationPicker = true;
376-
// await Launcher.LaunchFileAsync(file, options);
377-
// //var uri = new Uri(clickedOnItem.FilePath);
378-
// //BitmapImage bitmap = new BitmapImage();
379-
// //bitmap.UriSource = uri;
380-
// //LIS.image = bitmap;
381-
// //PhotoAlbum.largeImg.Source = bitmap;
382-
// }
383-
//}
384-
385349
public static DataGrid dataGrid;
386350

387351
public static void AllView_RightTapped(object sender, RightTappedRoutedEventArgs e)
@@ -573,7 +537,7 @@ public static void RenameItem_Click(object sender, RoutedEventArgs e)
573537
{
574538
var ItemSelected = GenericFileBrowser.data.SelectedIndex;
575539
var RowData = ItemViewModel.FilesAndFolders[ItemSelected];
576-
GenericFileBrowser.data.BeginEdit();
540+
//GenericFileBrowser.data.BeginEdit();
577541

578542
}
579543

‎Navigation/NavigationActions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.ComponentModel;
55
using System.Diagnostics;
66
using System.Linq;
7+
using System.Threading.Tasks;
78
using Windows.UI.Core;
89
using Windows.UI.Xaml;
910
using Windows.UI.Xaml.Media.Animation;

0 commit comments

Comments
 (0)