Skip to content

Commit 86a35e2

Browse files
lukeblevinslukeblevins
authored
Massive Cleanup of YourHome Markup (#838)
* Cleanup and remove unused code from Home page, tweak design, and make dialog boxes consistent * Add strings for warning dialogs
1 parent bc3e41f commit 86a35e2

18 files changed

+604
-1059
lines changed

‎Files/Files.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@
151151
<DependentUpon>ConfirmDeleteDialog.xaml</DependentUpon>
152152
</Compile>
153153
<Compile Include="Helpers\AcrylicTheme.cs" />
154+
<Compile Include="Helpers\DialogDisplayHelper.cs" />
154155
<Compile Include="Helpers\DispatcherHelper.cs" />
155156
<Compile Include="Helpers\ItemsDataTemplateSelector.cs" />
156157
<Compile Include="Helpers\NaturalStringComparer.cs" />

‎Files/Helpers/DialogDisplayHelper.cs

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
using System;
2+
using System.Threading.Tasks;
3+
using Windows.UI.Xaml;
4+
using Windows.UI.Xaml.Controls;
5+
6+
namespace Files.Helpers
7+
{
8+
class DialogDisplayHelper
9+
{
10+
/// <summary>
11+
/// Standard dialog, to ensure consistency.
12+
/// The secondaryText can be un-assigned to hide its respective button.
13+
/// Result is true if the user presses primary text button
14+
/// </summary>
15+
/// <param name="title">
16+
/// The title of this dialog
17+
/// </param>
18+
/// <param name="message">
19+
/// THe main body message displayed within the dialog
20+
/// </param>
21+
/// <param name="primaryText">
22+
/// Text to be displayed on the primary button (which returns true when pressed).
23+
/// If not set, defaults to 'OK'
24+
/// </param>
25+
/// <param name="secondaryText">
26+
/// The (optional) secondary button text.
27+
/// If not set, it won't be presented to the user at all.
28+
/// </param>
29+
public static async Task<bool> ShowDialog(string title, string message, string primaryText = "OK", string secondaryText = null)
30+
{
31+
bool result = false;
32+
33+
try
34+
{
35+
if (Window.Current.Content is Frame rootFrame)
36+
{
37+
var dialog = new ContentDialog
38+
{
39+
Title = title,
40+
Content = message,
41+
PrimaryButtonText = primaryText
42+
};
43+
44+
if (!string.IsNullOrEmpty(secondaryText))
45+
{
46+
dialog.SecondaryButtonText = secondaryText;
47+
}
48+
var dialogResult = await dialog.ShowAsync();
49+
50+
result = (dialogResult == ContentDialogResult.Primary);
51+
}
52+
}
53+
catch (Exception)
54+
{
55+
}
56+
57+
return result;
58+
}
59+
}
60+
}

‎Files/Interacts/Interaction.cs

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@
3232
using Windows.UI.WindowManagement.Preview;
3333
using Windows.UI;
3434
using Windows.Security.Cryptography.Core;
35-
using Microsoft.Toolkit.Uwp.Helpers;
3635
using Windows.Security.Cryptography;
3736
using Windows.Storage.Streams;
3837
using GalaSoft.MvvmLight.Command;
3938
using Files.Helpers;
4039
using Windows.UI.Xaml.Data;
41-
using System.Security.Cryptography;
4240

4341
namespace Files.Interacts
4442
{
@@ -389,8 +387,7 @@ private async void OpenSelectedItems(bool displayApplicationPicker)
389387
}
390388
catch (FileNotFoundException)
391389
{
392-
MessageDialog dialog = new MessageDialog("The file you are attempting to access may have been moved or deleted.", "File Not Found");
393-
await dialog.ShowAsync();
390+
await DialogDisplayHelper.ShowDialog(ResourceController.GetTranslation("FileNotFoundDialog.Title"), ResourceController.GetTranslation("FileNotFoundDialog.Text"));
394391
NavigationActions.Refresh_Click(null, null);
395392
}
396393
}
@@ -557,12 +554,11 @@ public async void DeleteItem_Click(object sender, RoutedEventArgs e)
557554
}
558555
catch (UnauthorizedAccessException)
559556
{
560-
MessageDialog AccessDeniedDialog = new MessageDialog("Access Denied", "Unable to delete this item");
561-
await AccessDeniedDialog.ShowAsync();
557+
await DialogDisplayHelper.ShowDialog(ResourceController.GetTranslation("AccessDeniedDeleteDialog.Title"), ResourceController.GetTranslation("AccessDeniedDeleteDialog.Text"));
562558
}
563559
catch (FileNotFoundException)
564560
{
565-
Debug.WriteLine("Attention: Tried to delete an item that could be found");
561+
await DialogDisplayHelper.ShowDialog(ResourceController.GetTranslation("FileNotFoundDialog.Title"), ResourceController.GetTranslation("FileNotFoundDialog.Text"));
566562
}
567563

568564
App.InteractionViewModel.PermanentlyDelete = StorageDeleteOption.Default; //reset PermanentlyDelete flag
@@ -954,9 +950,7 @@ public async void ToggleQuickLook()
954950
}
955951
catch (FileNotFoundException)
956952
{
957-
MessageDialog dialog = new MessageDialog("The file you are attempting to preview may have been moved or deleted.", "File Not Found");
958-
var task = dialog.ShowAsync();
959-
task.AsTask().Wait();
953+
await DialogDisplayHelper.ShowDialog(ResourceController.GetTranslation("FileNotFoundDialog.Title"), ResourceController.GetTranslation("FileNotFoundPreviewDialog.Text"));
960954
NavigationActions.Refresh_Click(null, null);
961955
}
962956
}

‎Files/LocationsList.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ public class FavoriteLocationItem
99
public string Icon { get; set; }
1010
public string Text { get; set; }
1111
public string Tag { get; set; }
12-
//public string DominantImageColor { get; set; }
1312
}
1413

1514
public class ItemLoader

‎Files/MultilingualResources/Files.de-DE.xlf

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,42 @@
647647
<source>Tiles View</source>
648648
<target state="new">Tiles View</target>
649649
</trans-unit>
650+
<trans-unit id="AccessDeniedDeleteDialog.Text" translate="yes" xml:space="preserve">
651+
<source>We weren't able to delete this item</source>
652+
<target state="new">We weren't able to delete this item</target>
653+
</trans-unit>
654+
<trans-unit id="AccessDeniedDeleteDialog.Title" translate="yes" xml:space="preserve">
655+
<source>Access Denied</source>
656+
<target state="new">Access Denied</target>
657+
</trans-unit>
658+
<trans-unit id="DriveUnpluggedDialog.Text" translate="yes" xml:space="preserve">
659+
<source>Please insert the necessary drive to access this item.</source>
660+
<target state="new">Please insert the necessary drive to access this item.</target>
661+
</trans-unit>
662+
<trans-unit id="DriveUnpluggedDialog.Title" translate="yes" xml:space="preserve">
663+
<source>Drive Unplugged</source>
664+
<target state="new">Drive Unplugged</target>
665+
</trans-unit>
666+
<trans-unit id="FileNotFoundDialog.Text" translate="yes" xml:space="preserve">
667+
<source>The file you are attempting to access may have been moved or deleted.</source>
668+
<target state="new">The file you are attempting to access may have been moved or deleted.</target>
669+
</trans-unit>
670+
<trans-unit id="FileNotFoundDialog.Title" translate="yes" xml:space="preserve">
671+
<source>File Not Found</source>
672+
<target state="new">File Not Found</target>
673+
</trans-unit>
674+
<trans-unit id="FileNotFoundPreviewDialog.Text" translate="yes" xml:space="preserve">
675+
<source>The file you are attempting to preview may have been moved or deleted.</source>
676+
<target state="new">The file you are attempting to preview may have been moved or deleted.</target>
677+
</trans-unit>
678+
<trans-unit id="FolderNotFoundDialog.Text" translate="yes" xml:space="preserve">
679+
<source>The folder you are attempting to access may have been moved or deleted.</source>
680+
<target state="new">The folder you are attempting to access may have been moved or deleted.</target>
681+
</trans-unit>
682+
<trans-unit id="FolderNotFoundDialog.Title" translate="yes" xml:space="preserve">
683+
<source>Did you delete this folder?</source>
684+
<target state="new">Did you delete this folder?</target>
685+
</trans-unit>
650686
</group>
651687
</body>
652688
</file>

‎Files/MultilingualResources/Files.es-ES.xlf

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,42 @@
646646
<source>Tiles View</source>
647647
<target state="translated">Vista en iconos</target>
648648
</trans-unit>
649+
<trans-unit id="AccessDeniedDeleteDialog.Text" translate="yes" xml:space="preserve">
650+
<source>We weren't able to delete this item</source>
651+
<target state="new">We weren't able to delete this item</target>
652+
</trans-unit>
653+
<trans-unit id="AccessDeniedDeleteDialog.Title" translate="yes" xml:space="preserve">
654+
<source>Access Denied</source>
655+
<target state="new">Access Denied</target>
656+
</trans-unit>
657+
<trans-unit id="DriveUnpluggedDialog.Text" translate="yes" xml:space="preserve">
658+
<source>Please insert the necessary drive to access this item.</source>
659+
<target state="new">Please insert the necessary drive to access this item.</target>
660+
</trans-unit>
661+
<trans-unit id="DriveUnpluggedDialog.Title" translate="yes" xml:space="preserve">
662+
<source>Drive Unplugged</source>
663+
<target state="new">Drive Unplugged</target>
664+
</trans-unit>
665+
<trans-unit id="FileNotFoundDialog.Text" translate="yes" xml:space="preserve">
666+
<source>The file you are attempting to access may have been moved or deleted.</source>
667+
<target state="new">The file you are attempting to access may have been moved or deleted.</target>
668+
</trans-unit>
669+
<trans-unit id="FileNotFoundDialog.Title" translate="yes" xml:space="preserve">
670+
<source>File Not Found</source>
671+
<target state="new">File Not Found</target>
672+
</trans-unit>
673+
<trans-unit id="FileNotFoundPreviewDialog.Text" translate="yes" xml:space="preserve">
674+
<source>The file you are attempting to preview may have been moved or deleted.</source>
675+
<target state="new">The file you are attempting to preview may have been moved or deleted.</target>
676+
</trans-unit>
677+
<trans-unit id="FolderNotFoundDialog.Text" translate="yes" xml:space="preserve">
678+
<source>The folder you are attempting to access may have been moved or deleted.</source>
679+
<target state="new">The folder you are attempting to access may have been moved or deleted.</target>
680+
</trans-unit>
681+
<trans-unit id="FolderNotFoundDialog.Title" translate="yes" xml:space="preserve">
682+
<source>Did you delete this folder?</source>
683+
<target state="new">Did you delete this folder?</target>
684+
</trans-unit>
649685
</group>
650686
</body>
651687
</file>

‎Files/MultilingualResources/Files.fr-FR.xlf

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,42 @@
648648
<source>Tiles View</source>
649649
<target state="new">Tiles View</target>
650650
</trans-unit>
651+
<trans-unit id="AccessDeniedDeleteDialog.Text" translate="yes" xml:space="preserve">
652+
<source>We weren't able to delete this item</source>
653+
<target state="new">We weren't able to delete this item</target>
654+
</trans-unit>
655+
<trans-unit id="AccessDeniedDeleteDialog.Title" translate="yes" xml:space="preserve">
656+
<source>Access Denied</source>
657+
<target state="new">Access Denied</target>
658+
</trans-unit>
659+
<trans-unit id="DriveUnpluggedDialog.Text" translate="yes" xml:space="preserve">
660+
<source>Please insert the necessary drive to access this item.</source>
661+
<target state="new">Please insert the necessary drive to access this item.</target>
662+
</trans-unit>
663+
<trans-unit id="DriveUnpluggedDialog.Title" translate="yes" xml:space="preserve">
664+
<source>Drive Unplugged</source>
665+
<target state="new">Drive Unplugged</target>
666+
</trans-unit>
667+
<trans-unit id="FileNotFoundDialog.Text" translate="yes" xml:space="preserve">
668+
<source>The file you are attempting to access may have been moved or deleted.</source>
669+
<target state="new">The file you are attempting to access may have been moved or deleted.</target>
670+
</trans-unit>
671+
<trans-unit id="FileNotFoundDialog.Title" translate="yes" xml:space="preserve">
672+
<source>File Not Found</source>
673+
<target state="new">File Not Found</target>
674+
</trans-unit>
675+
<trans-unit id="FileNotFoundPreviewDialog.Text" translate="yes" xml:space="preserve">
676+
<source>The file you are attempting to preview may have been moved or deleted.</source>
677+
<target state="new">The file you are attempting to preview may have been moved or deleted.</target>
678+
</trans-unit>
679+
<trans-unit id="FolderNotFoundDialog.Text" translate="yes" xml:space="preserve">
680+
<source>The folder you are attempting to access may have been moved or deleted.</source>
681+
<target state="new">The folder you are attempting to access may have been moved or deleted.</target>
682+
</trans-unit>
683+
<trans-unit id="FolderNotFoundDialog.Title" translate="yes" xml:space="preserve">
684+
<source>Did you delete this folder?</source>
685+
<target state="new">Did you delete this folder?</target>
686+
</trans-unit>
651687
</group>
652688
</body>
653689
</file>

‎Files/MultilingualResources/Files.it-IT.xlf

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,42 @@
647647
<source>Tiles View</source>
648648
<target state="new">Tiles View</target>
649649
</trans-unit>
650+
<trans-unit id="AccessDeniedDeleteDialog.Text" translate="yes" xml:space="preserve">
651+
<source>We weren't able to delete this item</source>
652+
<target state="new">We weren't able to delete this item</target>
653+
</trans-unit>
654+
<trans-unit id="AccessDeniedDeleteDialog.Title" translate="yes" xml:space="preserve">
655+
<source>Access Denied</source>
656+
<target state="new">Access Denied</target>
657+
</trans-unit>
658+
<trans-unit id="DriveUnpluggedDialog.Text" translate="yes" xml:space="preserve">
659+
<source>Please insert the necessary drive to access this item.</source>
660+
<target state="new">Please insert the necessary drive to access this item.</target>
661+
</trans-unit>
662+
<trans-unit id="DriveUnpluggedDialog.Title" translate="yes" xml:space="preserve">
663+
<source>Drive Unplugged</source>
664+
<target state="new">Drive Unplugged</target>
665+
</trans-unit>
666+
<trans-unit id="FileNotFoundDialog.Text" translate="yes" xml:space="preserve">
667+
<source>The file you are attempting to access may have been moved or deleted.</source>
668+
<target state="new">The file you are attempting to access may have been moved or deleted.</target>
669+
</trans-unit>
670+
<trans-unit id="FileNotFoundDialog.Title" translate="yes" xml:space="preserve">
671+
<source>File Not Found</source>
672+
<target state="new">File Not Found</target>
673+
</trans-unit>
674+
<trans-unit id="FileNotFoundPreviewDialog.Text" translate="yes" xml:space="preserve">
675+
<source>The file you are attempting to preview may have been moved or deleted.</source>
676+
<target state="new">The file you are attempting to preview may have been moved or deleted.</target>
677+
</trans-unit>
678+
<trans-unit id="FolderNotFoundDialog.Text" translate="yes" xml:space="preserve">
679+
<source>The folder you are attempting to access may have been moved or deleted.</source>
680+
<target state="new">The folder you are attempting to access may have been moved or deleted.</target>
681+
</trans-unit>
682+
<trans-unit id="FolderNotFoundDialog.Title" translate="yes" xml:space="preserve">
683+
<source>Did you delete this folder?</source>
684+
<target state="new">Did you delete this folder?</target>
685+
</trans-unit>
650686
</group>
651687
</body>
652688
</file>

‎Files/MultilingualResources/Files.nl-NL.xlf

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,42 @@
648648
<source>Tiles View</source>
649649
<target state="new">Tiles View</target>
650650
</trans-unit>
651+
<trans-unit id="AccessDeniedDeleteDialog.Text" translate="yes" xml:space="preserve">
652+
<source>We weren't able to delete this item</source>
653+
<target state="new">We weren't able to delete this item</target>
654+
</trans-unit>
655+
<trans-unit id="AccessDeniedDeleteDialog.Title" translate="yes" xml:space="preserve">
656+
<source>Access Denied</source>
657+
<target state="new">Access Denied</target>
658+
</trans-unit>
659+
<trans-unit id="DriveUnpluggedDialog.Text" translate="yes" xml:space="preserve">
660+
<source>Please insert the necessary drive to access this item.</source>
661+
<target state="new">Please insert the necessary drive to access this item.</target>
662+
</trans-unit>
663+
<trans-unit id="DriveUnpluggedDialog.Title" translate="yes" xml:space="preserve">
664+
<source>Drive Unplugged</source>
665+
<target state="new">Drive Unplugged</target>
666+
</trans-unit>
667+
<trans-unit id="FileNotFoundDialog.Text" translate="yes" xml:space="preserve">
668+
<source>The file you are attempting to access may have been moved or deleted.</source>
669+
<target state="new">The file you are attempting to access may have been moved or deleted.</target>
670+
</trans-unit>
671+
<trans-unit id="FileNotFoundDialog.Title" translate="yes" xml:space="preserve">
672+
<source>File Not Found</source>
673+
<target state="new">File Not Found</target>
674+
</trans-unit>
675+
<trans-unit id="FileNotFoundPreviewDialog.Text" translate="yes" xml:space="preserve">
676+
<source>The file you are attempting to preview may have been moved or deleted.</source>
677+
<target state="new">The file you are attempting to preview may have been moved or deleted.</target>
678+
</trans-unit>
679+
<trans-unit id="FolderNotFoundDialog.Text" translate="yes" xml:space="preserve">
680+
<source>The folder you are attempting to access may have been moved or deleted.</source>
681+
<target state="new">The folder you are attempting to access may have been moved or deleted.</target>
682+
</trans-unit>
683+
<trans-unit id="FolderNotFoundDialog.Title" translate="yes" xml:space="preserve">
684+
<source>Did you delete this folder?</source>
685+
<target state="new">Did you delete this folder?</target>
686+
</trans-unit>
651687
</group>
652688
</body>
653689
</file>

0 commit comments

Comments
 (0)