Skip to content

Commit 0532ef6

Browse files
committed
Remove Collision Dialogs, Vastly Improve the Paste Experience
1 parent e5c4b18 commit 0532ef6

File tree

8 files changed

+176
-479
lines changed

8 files changed

+176
-479
lines changed

AddItem.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
4343
if (userInput != null)
4444
{
4545
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) });
46+
ItemViewModel.FilesAndFolders.Add(new ListedItem(){ FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Collapsed, FolderImg = Visibility.Visible, FileIconVis = Visibility.Collapsed, FileExtension = "Folder", FileImg = null, FilePath = (ItemViewModel.PUIP.Path + "\\" + userInput) });
4747
}
4848
}
4949
else if ((e.ClickedItem as AddListItem).Header == "Text Document")
@@ -53,7 +53,7 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
5353
if (userInput != null)
5454
{
5555
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") });
56+
ItemViewModel.FilesAndFolders.Add(new ListedItem() { FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileExtension = "Text Document", FileImg = null, FilePath = (ItemViewModel.PUIP.Path + "\\" + userInput + ".txt") });
5757
}
5858
}
5959
else if ((e.ClickedItem as AddListItem).Header == "Bitmap Image")
@@ -63,7 +63,7 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
6363
if (userInput != null)
6464
{
6565
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") });
66+
ItemViewModel.FilesAndFolders.Add(new ListedItem() { FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileExtension = "BMP File", FileImg = null, FilePath = (ItemViewModel.PUIP.Path + "\\" + userInput + ".bmp") });
6767

6868
}
6969
}

Filesystem/ItemViewModel.cs

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public class ItemViewModel
3939
static string gotFolName;
4040
static string gotFolDate;
4141
static string gotFolPath;
42+
static string gotDotFileExtension;
4243
static string gotFolType;
4344
static Visibility gotFileImgVis;
4445
static Visibility gotEmptyImgVis;
@@ -89,27 +90,6 @@ public static ProgressUIVisibility PVIS
8990
private static ProgressUIPath pUIp = new ProgressUIPath();
9091
public static ProgressUIPath PUIP { get { return ItemViewModel.pUIp; } }
9192

92-
private static ProgressUIButtonText buttonText = new ProgressUIButtonText();
93-
public static ProgressUIButtonText ButtonText { get { return ItemViewModel.buttonText; } }
94-
95-
private static CollisionBoxHeader collisionBoxHeader = new CollisionBoxHeader();
96-
public static CollisionBoxHeader CollisionBoxHeader { get { return collisionBoxHeader; } }
97-
98-
private static CollisionBoxSubHeader collisionBoxSubHeader = new CollisionBoxSubHeader();
99-
public static CollisionBoxSubHeader CollisionBoxSubHeader { get { return collisionBoxSubHeader; } }
100-
101-
private static CollisionUIVisibility collisionUIVisibility = new CollisionUIVisibility();
102-
public static CollisionUIVisibility CollisionUIVisibility { get { return collisionUIVisibility; } }
103-
104-
private static CollisionBoxHeader conflictBoxHeader = new CollisionBoxHeader();
105-
public static CollisionBoxHeader ConflictBoxHeader { get { return conflictBoxHeader; } }
106-
107-
private static CollisionBoxSubHeader conflictBoxSubHeader = new CollisionBoxSubHeader();
108-
public static CollisionBoxSubHeader ConflictBoxSubHeader { get { return conflictBoxSubHeader; } }
109-
110-
private static CollisionUIVisibility conflictUIVisibility = new CollisionUIVisibility();
111-
public static CollisionUIVisibility ConflictUIVisibility { get { return conflictUIVisibility; } }
112-
11393
private static EmptyFolderTextState textState = new EmptyFolderTextState();
11494
public static EmptyFolderTextState TextState { get { return textState; } }
11595

@@ -270,6 +250,7 @@ public async void MemoryFriendlyGetItemsAsync(string path, CancellationToken tok
270250
}
271251
gotPath = file.Path.ToString();
272252
gotFolImg = Visibility.Collapsed;
253+
gotDotFileExtension = file.FileType;
273254
if (isPhotoAlbumMode == false)
274255
{
275256
const uint requestedSize = 20;
@@ -296,7 +277,7 @@ public async void MemoryFriendlyGetItemsAsync(string path, CancellationToken tok
296277
}
297278
else
298279
{
299-
FilesAndFolders.Add(new ListedItem() { EmptyImgVis = gotEmptyImgVis, FileImg = icon, FileIconVis = gotFileImgVis, FolderImg = gotFolImg, FileName = gotName, FileDate = gotDate, FileExtension = gotType, FilePath = gotPath });
280+
FilesAndFolders.Add(new ListedItem() { DotFileExtension = gotDotFileExtension, EmptyImgVis = gotEmptyImgVis, FileImg = icon, FileIconVis = gotFileImgVis, FolderImg = gotFolImg, FileName = gotName, FileDate = gotDate, FileExtension = gotType, FilePath = gotPath });
300281
}
301282
}
302283
catch
@@ -404,20 +385,6 @@ public static int UpdateProgUI(int level)
404385
return (int)level;
405386
}
406387

407-
public static async void DisplayCollisionUIWithArgs(string header, string subHeader)
408-
{
409-
CollisionBoxHeader.Header = header;
410-
CollisionBoxSubHeader.SubHeader = subHeader;
411-
await GenericFileBrowser.collisionBox.ShowAsync();
412-
}
413-
414-
public static async void DisplayReviewUIWithArgs(string header, string subHeader)
415-
{
416-
ConflictBoxHeader.Header = header;
417-
ConflictBoxSubHeader.SubHeader = subHeader;
418-
await GenericFileBrowser.reviewBox.ShowAsync();
419-
}
420-
421388
public static async void FillTreeNode(object item, TreeView EntireControl)
422389
{
423390
var pathToFillFrom = (item as Classic_ListedFolderItem)?.FilePath;

Filesystem/ListedItem.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public class ListedItem
1212
public string FileName { get; set; }
1313
public string FileDate { get; set; }
1414
public string FileExtension { get; set; }
15+
public string DotFileExtension { get; set; }
1516
public string FilePath { get; set; }
1617
public int ItemIndex { get; set; }
1718
public ListedItem()

0 commit comments

Comments
 (0)