Skip to content

Commit 713e777

Browse files
lukeblevinslukeblevins
committed
Cleanups, New Unhandled Exception Message
1 parent 8ae11ef commit 713e777

19 files changed

+671
-778
lines changed

‎Files UWP/AddItem.xaml.cs‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ namespace Files
1414
public sealed partial class AddItem : Page
1515
{
1616
public ListView addItemsChoices;
17-
public ItemViewModel<AddItem> instanceViewModel;
1817
public AddItem()
1918
{
2019
this.InitializeComponent();
@@ -27,14 +26,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
2726
{
2827
base.OnNavigatedTo(eventArgs);
2928
var parameters = eventArgs.Parameter;
30-
if (parameters.GetType() == typeof(GenericFileBrowser))
31-
{
32-
instanceViewModel = new ItemViewModel<AddItem>();
33-
}
34-
else if (parameters.GetType() == typeof(PhotoAlbum))
35-
{
36-
instanceViewModel = new ItemViewModel<AddItem>();
37-
}
29+
3830
}
3931

4032
public static List<AddListItem> AddItemsList = new List<AddListItem>();
@@ -52,7 +44,7 @@ public T GetCurrentSelectedTabInstance<T>()
5244
{
5345
Frame rootFrame = Window.Current.Content as Frame;
5446
var instanceTabsView = rootFrame.Content as InstanceTabsView;
55-
var selectedTabContent = ((instanceTabsView.tabView.SelectedItem as TabViewItem).Content as Grid);
47+
var selectedTabContent = ((InstanceTabsView.tabView.SelectedItem as TabViewItem).Content as Grid);
5648
foreach (UIElement uiElement in selectedTabContent.Children)
5749
{
5850
if (uiElement.GetType() == typeof(Frame))
@@ -69,11 +61,11 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
6961
string currentPath = null;
7062
if (TabInstance.accessibleContentFrame.SourcePageType == typeof(GenericFileBrowser))
7163
{
72-
currentPath = (TabInstance.accessibleContentFrame.Content as GenericFileBrowser).instanceViewModel.Universal.path;
64+
currentPath = TabInstance.instanceViewModel.Universal.path;
7365
}
7466
else if (TabInstance.accessibleContentFrame.SourcePageType == typeof(PhotoAlbum))
7567
{
76-
currentPath = (TabInstance.accessibleContentFrame.Content as PhotoAlbum).instanceViewModel.Universal.path;
68+
currentPath = TabInstance.instanceViewModel.Universal.path;
7769
}
7870
StorageFolder folderToCreateItem = await StorageFolder.GetFolderFromPathAsync(currentPath);
7971
RenameDialog renameDialog = new RenameDialog();
@@ -84,12 +76,12 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
8476
if (userInput != "")
8577
{
8678
var folder = await folderToCreateItem.CreateFolderAsync(userInput, CreationCollisionOption.FailIfExists);
87-
instanceViewModel.AddFileOrFolder(new ListedItem(folder.FolderRelativeId){ FileName = userInput, FileDateReal = DateTimeOffset.Now, EmptyImgVis = Visibility.Collapsed, FolderImg = Visibility.Visible, FileIconVis = Visibility.Collapsed, FileType = "Folder", FileImg = null, FilePath = (instanceViewModel.Universal.path + "\\" + userInput) });
79+
TabInstance.instanceViewModel.AddFileOrFolder(new ListedItem(folder.FolderRelativeId){ FileName = userInput, FileDateReal = DateTimeOffset.Now, EmptyImgVis = Visibility.Collapsed, FolderImg = Visibility.Visible, FileIconVis = Visibility.Collapsed, FileType = "Folder", FileImg = null, FilePath = (TabInstance.instanceViewModel.Universal.path + "\\" + userInput) });
8880
}
8981
else
9082
{
9183
var folder = await folderToCreateItem.CreateFolderAsync("New Folder", CreationCollisionOption.GenerateUniqueName);
92-
instanceViewModel.AddFileOrFolder(new ListedItem(folder.FolderRelativeId) { FileName = userInput, FileDateReal = DateTimeOffset.Now, EmptyImgVis = Visibility.Collapsed, FolderImg = Visibility.Visible, FileIconVis = Visibility.Collapsed, FileType = "Folder", FileImg = null, FilePath = (instanceViewModel.Universal.path + "\\" + userInput) });
84+
TabInstance.instanceViewModel.AddFileOrFolder(new ListedItem(folder.FolderRelativeId) { FileName = userInput, FileDateReal = DateTimeOffset.Now, EmptyImgVis = Visibility.Collapsed, FolderImg = Visibility.Visible, FileIconVis = Visibility.Collapsed, FileType = "Folder", FileImg = null, FilePath = (TabInstance.instanceViewModel.Universal.path + "\\" + userInput) });
9385
}
9486
}
9587
else if ((e.ClickedItem as AddListItem).Header == "Text Document")
@@ -99,12 +91,12 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
9991
if (userInput != "")
10092
{
10193
var folder = await folderToCreateItem.CreateFileAsync(userInput + ".txt", CreationCollisionOption.FailIfExists);
102-
instanceViewModel.AddFileOrFolder(new ListedItem(folder.FolderRelativeId) { FileName = userInput, FileDateReal = DateTimeOffset.Now, EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = "Text Document", FileImg = null, FilePath = (instanceViewModel.Universal.path + "\\" + userInput + ".txt"), DotFileExtension = ".txt" });
94+
TabInstance.instanceViewModel.AddFileOrFolder(new ListedItem(folder.FolderRelativeId) { FileName = userInput, FileDateReal = DateTimeOffset.Now, EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = "Text Document", FileImg = null, FilePath = (TabInstance.instanceViewModel.Universal.path + "\\" + userInput + ".txt"), DotFileExtension = ".txt" });
10395
}
10496
else
10597
{
10698
var folder = await folderToCreateItem.CreateFileAsync("New Text Document" + ".txt", CreationCollisionOption.GenerateUniqueName);
107-
instanceViewModel.AddFileOrFolder(new ListedItem(folder.FolderRelativeId) { FileName = userInput, FileDateReal = DateTimeOffset.Now, EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = "Text Document", FileImg = null, FilePath = (instanceViewModel.Universal.path + "\\" + userInput + ".txt"), DotFileExtension = ".txt" });
99+
TabInstance.instanceViewModel.AddFileOrFolder(new ListedItem(folder.FolderRelativeId) { FileName = userInput, FileDateReal = DateTimeOffset.Now, EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = "Text Document", FileImg = null, FilePath = (TabInstance.instanceViewModel.Universal.path + "\\" + userInput + ".txt"), DotFileExtension = ".txt" });
108100
}
109101
}
110102
else if ((e.ClickedItem as AddListItem).Header == "Bitmap Image")
@@ -114,12 +106,12 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
114106
if (userInput != "")
115107
{
116108
var folder = await folderToCreateItem.CreateFileAsync(userInput + ".bmp", CreationCollisionOption.FailIfExists);
117-
instanceViewModel.AddFileOrFolder(new ListedItem(folder.FolderRelativeId) { FileName = userInput, FileDateReal = DateTimeOffset.Now, EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = "BMP File", FileImg = null, FilePath = (instanceViewModel.Universal.path + "\\" + userInput + ".bmp"), DotFileExtension = ".bmp" });
109+
TabInstance.instanceViewModel.AddFileOrFolder(new ListedItem(folder.FolderRelativeId) { FileName = userInput, FileDateReal = DateTimeOffset.Now, EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = "BMP File", FileImg = null, FilePath = (TabInstance.instanceViewModel.Universal.path + "\\" + userInput + ".bmp"), DotFileExtension = ".bmp" });
118110
}
119111
else
120112
{
121113
var folder = await folderToCreateItem.CreateFileAsync("New Bitmap Image" + ".bmp", CreationCollisionOption.GenerateUniqueName);
122-
instanceViewModel.AddFileOrFolder(new ListedItem(folder.FolderRelativeId) { FileName = userInput, FileDateReal = DateTimeOffset.Now, EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = "BMP File", FileImg = null, FilePath = (instanceViewModel.Universal.path + "\\" + userInput + ".bmp"), DotFileExtension = ".bmp" });
114+
TabInstance.instanceViewModel.AddFileOrFolder(new ListedItem(folder.FolderRelativeId) { FileName = userInput, FileDateReal = DateTimeOffset.Now, EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = "BMP File", FileImg = null, FilePath = (TabInstance.instanceViewModel.Universal.path + "\\" + userInput + ".bmp"), DotFileExtension = ".bmp" });
123115
}
124116
}
125117
}

‎Files UWP/App.xaml.cs‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
using Microsoft.AppCenter;
1717
using Microsoft.AppCenter.Analytics;
1818
using Microsoft.AppCenter.Crashes;
19+
using Windows.UI.Xaml.Media;
1920

2021
namespace Files
2122
{
@@ -24,6 +25,7 @@ sealed partial class App : Application
2425
public App()
2526
{
2627
this.InitializeComponent();
28+
exceptionDialog = new Dialogs.ExceptionDialog();
2729
this.Suspending += OnSuspending;
2830
this.UnhandledException += App_UnhandledException;
2931

@@ -46,12 +48,12 @@ public App()
4648
if (localSettings.Values["theme"].ToString() == "Light")
4749
{
4850
SettingsPages.Personalization.TV.ThemeValue = ApplicationTheme.Light;
49-
Debug.WriteLine("Theme Requested as Light");
51+
//Debug.WriteLine("Theme Requested as Light");
5052
}
5153
else if (localSettings.Values["theme"].ToString() == "Dark")
5254
{
5355
SettingsPages.Personalization.TV.ThemeValue = ApplicationTheme.Dark;
54-
Debug.WriteLine("Theme Requested as Dark");
56+
//Debug.WriteLine("Theme Requested as Dark");
5557
}
5658
else
5759
{
@@ -60,30 +62,38 @@ public App()
6062
if (color == Colors.White)
6163
{
6264
SettingsPages.Personalization.TV.ThemeValue = ApplicationTheme.Light;
63-
Debug.WriteLine("Theme Requested as Default (Light)");
65+
// Debug.WriteLine("Theme Requested as Default (Light)");
6466

6567
}
6668
else
6769
{
6870
SettingsPages.Personalization.TV.ThemeValue = ApplicationTheme.Dark;
69-
Debug.WriteLine("Theme Requested as Default (Dark)");
71+
//Debug.WriteLine("Theme Requested as Default (Dark)");
7072
}
7173
}
7274
}
7375

7476
this.RequestedTheme = SettingsPages.Personalization.TV.ThemeValue;
75-
Debug.WriteLine("!!Requested Theme!!" + RequestedTheme.ToString());
77+
//Debug.WriteLine("!!Requested Theme!!" + RequestedTheme.ToString());
7678
}
7779

78-
private void App_UnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
80+
public static Windows.UI.Xaml.UnhandledExceptionEventArgs exceptionInfo { get; set; }
81+
public static string exceptionStackTrace { get; set; }
82+
public Dialogs.ExceptionDialog exceptionDialog;
83+
84+
private async void App_UnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
7985
{
8086
e.Handled = true;
81-
Frame rootFrame = Window.Current.Content as Frame;
82-
rootFrame.Navigate(typeof(UnhandledExceptionDisplay), e.Exception);
87+
if(exceptionDialog.Visibility == Visibility.Visible)
88+
exceptionDialog.Hide();
89+
90+
exceptionInfo = e;
91+
exceptionStackTrace = e.Exception.StackTrace;
92+
await exceptionDialog.ShowAsync();
93+
8394
}
8495

8596
public static PasteState PS { get; set; } = new PasteState();
86-
8797
public static List<string> pathsToDeleteAfterPaste = new List<string>();
8898

8999
/// <summary>

‎Files UWP/ClassicMode.xaml‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

‎Files UWP/ClassicMode.xaml.cs‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)