Skip to content

Commit 9004a7b

Browse files
yaira2yaira2
authored
Improved Accessibility (#5937)
1 parent 2b16f7c commit 9004a7b

File tree

85 files changed

+1534
-2567
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1534
-2567
lines changed

‎Files/App.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ sealed partial class App : Application
5656
public static Logger Logger { get; private set; }
5757
private static readonly UniversalLogWriter logWriter = new UniversalLogWriter();
5858

59-
public static StatusCenterViewModel StatusCenterViewModel { get; } = new StatusCenterViewModel();
59+
public static OngoingTasksViewModel OngoingTasksViewModel { get; } = new OngoingTasksViewModel();
6060
public static SecondaryTileHelper SecondaryTileHelper { get; private set; } = new SecondaryTileHelper();
6161

6262
public App()

‎Files/Files.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@
187187
<Compile Include="Filesystem\StorageItems\SystemStorageFolder.cs" />
188188
<Compile Include="Filesystem\StorageItems\ZipStorageFile.cs" />
189189
<Compile Include="Filesystem\StorageItems\ZipStorageFolder.cs" />
190+
<Compile Include="Helpers\ResourceHelpers.cs" />
190191
<Compile Include="Helpers\FtpHelpers.cs" />
191192
<Compile Include="Helpers\ItemListDisplayHelpers\GroupedCollection.cs" />
192193
<Compile Include="Helpers\ItemListDisplayHelpers\GroupingHelper.cs" />
@@ -473,8 +474,8 @@
473474
<Compile Include="UserControls\StatusBarControl.xaml.cs">
474475
<DependentUpon>StatusBarControl.xaml</DependentUpon>
475476
</Compile>
476-
<Compile Include="UserControls\StatusCenter.xaml.cs">
477-
<DependentUpon>StatusCenter.xaml</DependentUpon>
477+
<Compile Include="UserControls\OngoingTasksFlyout.xaml.cs">
478+
<DependentUpon>OngoingTasksFlyout.xaml</DependentUpon>
478479
</Compile>
479480
<Compile Include="UserControls\MultitaskingControl\TabItem\TabItem.cs" />
480481
<Compile Include="UserControls\MultitaskingControl\VerticalTabViewControl.xaml.cs">
@@ -1311,7 +1312,7 @@
13111312
<SubType>Designer</SubType>
13121313
<Generator>MSBuild:Compile</Generator>
13131314
</Page>
1314-
<Page Include="UserControls\StatusCenter.xaml">
1315+
<Page Include="UserControls\OngoingTasksFlyout.xaml">
13151316
<SubType>Designer</SubType>
13161317
<Generator>MSBuild:Compile</Generator>
13171318
</Page>

‎Files/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class FilesystemHelpers : IFilesystemHelpers
4242

4343
private Task<NamedPipeAsAppServiceConnection> ServiceConnection => AppServiceConnectionHelper.Instance;
4444

45-
private StatusCenterViewModel statusCenterViewModel => App.StatusCenterViewModel;
45+
private OngoingTasksViewModel OngoingTasksViewModel => App.OngoingTasksViewModel;
4646

4747
#region Helpers Members
4848

@@ -154,7 +154,7 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat
154154
if (permanently)
155155
{
156156
// deleting items from <x>
157-
banner = statusCenterViewModel.PostOperationBanner(string.Empty,
157+
banner = OngoingTasksViewModel.PostOperationBanner(string.Empty,
158158
string.Format(source.Count() > 1 ? "StatusDeletingItemsDetails_Plural".GetLocalized() : "StatusDeletingItemsDetails_Singular".GetLocalized(), source.Count(), sourceDir),
159159
0,
160160
ReturnResult.InProgress,
@@ -164,7 +164,7 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat
164164
else
165165
{
166166
// "Moving items from <x> to recycle bin"
167-
banner = statusCenterViewModel.PostOperationBanner(string.Empty,
167+
banner = OngoingTasksViewModel.PostOperationBanner(string.Empty,
168168
string.Format(source.Count() > 1 ? "StatusMovingItemsDetails_Plural".GetLocalized() : "StatusMovingItemsDetails_Singular".GetLocalized(), source.Count(), sourceDir, "TheRecycleBin".GetLocalized()),
169169
0,
170170
ReturnResult.InProgress,
@@ -198,7 +198,7 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat
198198
{
199199
if (permanently)
200200
{
201-
statusCenterViewModel.PostBanner(
201+
OngoingTasksViewModel.PostBanner(
202202
"StatusDeletionCancelled".GetLocalized(),
203203
string.Format(source.Count() > 1 ?
204204
itemsDeleted > 1 ? "StatusDeleteCanceledDetails_Plural".GetLocalized() : "StatusDeleteCanceledDetails_Plural2".GetLocalized()
@@ -209,7 +209,7 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat
209209
}
210210
else
211211
{
212-
statusCenterViewModel.PostBanner(
212+
OngoingTasksViewModel.PostBanner(
213213
"StatusRecycleCancelled".GetLocalized(),
214214
string.Format(source.Count() > 1 ?
215215
itemsDeleted > 1 ? "StatusMoveCanceledDetails_Plural".GetLocalized() : "StatusMoveCanceledDetails_Plural2".GetLocalized()
@@ -223,7 +223,7 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat
223223
{
224224
if (permanently)
225225
{
226-
statusCenterViewModel.PostBanner(
226+
OngoingTasksViewModel.PostBanner(
227227
"StatusDeletionComplete".GetLocalized(),
228228
string.Format(source.Count() > 1 ? "StatusDeletedItemsDetails_Plural".GetLocalized() : "StatusDeletedItemsDetails_Singular".GetLocalized(), source.Count(), sourceDir, itemsDeleted),
229229
0,
@@ -232,7 +232,7 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat
232232
}
233233
else
234234
{
235-
statusCenterViewModel.PostBanner(
235+
OngoingTasksViewModel.PostBanner(
236236
"StatusRecycleComplete".GetLocalized(),
237237
string.Format(source.Count() > 1 ? "StatusMovedItemsDetails_Plural".GetLocalized() : "StatusMovedItemsDetails_Singular".GetLocalized(), source.Count(), sourceDir, "TheRecycleBin".GetLocalized()),
238238
0,
@@ -244,7 +244,7 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat
244244
{
245245
if (permanently)
246246
{
247-
statusCenterViewModel.PostBanner(
247+
OngoingTasksViewModel.PostBanner(
248248
"StatusDeletionFailed".GetLocalized(),
249249
string.Format(source.Count() > 1 ? "StatusDeletionFailedDetails_Plural".GetLocalized() : "StatusDeletionFailedDetails_Singular".GetLocalized(), source.Count(), sourceDir),
250250
0,
@@ -253,7 +253,7 @@ public async Task<ReturnResult> DeleteItemsAsync(IEnumerable<IStorageItemWithPat
253253
}
254254
else
255255
{
256-
statusCenterViewModel.PostBanner(
256+
OngoingTasksViewModel.PostBanner(
257257
"StatusRecycleFailed".GetLocalized(),
258258
string.Format(source.Count() > 1 ? "StatusMoveFailedDetails_Plural".GetLocalized() : "StatusMoveFailedDetails_Singular".GetLocalized(), source.Count(), sourceDir, "TheRecycleBin".GetLocalized()),
259259
0,
@@ -278,15 +278,15 @@ public async Task<ReturnResult> DeleteItemAsync(IStorageItemWithPath source, boo
278278

279279
if (permanently)
280280
{
281-
banner = statusCenterViewModel.PostBanner(string.Empty,
281+
banner = OngoingTasksViewModel.PostBanner(string.Empty,
282282
associatedInstance.FilesystemViewModel.WorkingDirectory,
283283
0,
284284
ReturnResult.InProgress,
285285
FileOperationType.Delete);
286286
}
287287
else
288288
{
289-
banner = statusCenterViewModel.PostBanner(string.Empty,
289+
banner = OngoingTasksViewModel.PostBanner(string.Empty,
290290
associatedInstance.FilesystemViewModel.WorkingDirectory,
291291
0,
292292
ReturnResult.InProgress,
@@ -459,7 +459,7 @@ public async Task<ReturnResult> CopyItemsAsync(IEnumerable<IStorageItemWithPath>
459459
var sourceDir = PathNormalization.GetParentDir(source.FirstOrDefault()?.Path);
460460
var destinationDir = PathNormalization.GetParentDir(destination.FirstOrDefault());
461461

462-
PostedStatusBanner banner = statusCenterViewModel.PostOperationBanner(
462+
PostedStatusBanner banner = OngoingTasksViewModel.PostOperationBanner(
463463
string.Empty,
464464
string.Format(source.Count() > 1 ? "StatusCopyingItemsDetails_Plural".GetLocalized() : "StatusCopyingItemsDetails_Singular".GetLocalized(), source.Count(), destinationDir),
465465
0,
@@ -499,7 +499,7 @@ public async Task<ReturnResult> CopyItemsAsync(IEnumerable<IStorageItemWithPath>
499499

500500
if (!token.IsCancellationRequested)
501501
{
502-
statusCenterViewModel.PostBanner(
502+
OngoingTasksViewModel.PostBanner(
503503
"StatusCopyComplete".GetLocalized(),
504504
string.Format(source.Count() > 1 ? "StatusCopiedItemsDetails_Plural".GetLocalized() : "StatusCopiedItemsDetails_Singular".GetLocalized(), source.Count(), destinationDir, itemsCopied),
505505
0,
@@ -508,7 +508,7 @@ public async Task<ReturnResult> CopyItemsAsync(IEnumerable<IStorageItemWithPath>
508508
}
509509
else
510510
{
511-
statusCenterViewModel.PostBanner(
511+
OngoingTasksViewModel.PostBanner(
512512
"StatusCopyCanceled".GetLocalized(),
513513
string.Format(source.Count() > 1 ?
514514
itemsCopied > 1 ? "StatusCopyCanceledDetails_Plural".GetLocalized() : "StatusCopyCanceledDetails_Plural2".GetLocalized() :
@@ -523,7 +523,7 @@ public async Task<ReturnResult> CopyItemsAsync(IEnumerable<IStorageItemWithPath>
523523

524524
public async Task<ReturnResult> CopyItemAsync(IStorageItemWithPath source, string destination, bool showDialog, bool registerHistory)
525525
{
526-
PostedStatusBanner banner = statusCenterViewModel.PostBanner(
526+
PostedStatusBanner banner = OngoingTasksViewModel.PostBanner(
527527
string.Empty,
528528
associatedInstance.FilesystemViewModel.WorkingDirectory,
529529
0,
@@ -569,7 +569,7 @@ public async Task<ReturnResult> CopyItemAsync(IStorageItemWithPath source, strin
569569

570570
if (sw.Elapsed.TotalSeconds >= 10)
571571
{
572-
statusCenterViewModel.PostBanner(
572+
OngoingTasksViewModel.PostBanner(
573573
"StatusCopyComplete".GetLocalized(),
574574
"StatusOperationCompleted".GetLocalized(),
575575
0,
@@ -673,7 +673,7 @@ public async Task<ReturnResult> MoveItemsAsync(IEnumerable<IStorageItemWithPath>
673673
var sourceDir = PathNormalization.GetParentDir(source.FirstOrDefault()?.Path);
674674
var destinationDir = PathNormalization.GetParentDir(destination.FirstOrDefault());
675675

676-
PostedStatusBanner banner = statusCenterViewModel.PostOperationBanner(
676+
PostedStatusBanner banner = OngoingTasksViewModel.PostOperationBanner(
677677
string.Empty,
678678
string.Format(source.Count() > 1 ? "StatusMovingItemsDetails_Plural".GetLocalized() : "StatusMovingItemsDetails_Singular".GetLocalized(), source.Count(), sourceDir, destinationDir),
679679
0,
@@ -715,7 +715,7 @@ public async Task<ReturnResult> MoveItemsAsync(IEnumerable<IStorageItemWithPath>
715715

716716
if (!token.IsCancellationRequested)
717717
{
718-
statusCenterViewModel.PostBanner(
718+
OngoingTasksViewModel.PostBanner(
719719
"StatusMoveComplete".GetLocalized(),
720720
string.Format(source.Count() > 1 ? "StatusMovedItemsDetails_Plural".GetLocalized() : "StatusMovedItemsDetails_Singular".GetLocalized(), source.Count(), sourceDir, destinationDir, itemsMoved),
721721
0,
@@ -724,7 +724,7 @@ public async Task<ReturnResult> MoveItemsAsync(IEnumerable<IStorageItemWithPath>
724724
}
725725
else
726726
{
727-
statusCenterViewModel.PostBanner(
727+
OngoingTasksViewModel.PostBanner(
728728
"StatusMoveCanceled".GetLocalized(),
729729
string.Format(source.Count() > 1 ?
730730
itemsMoved > 1 ? "StatusMoveCanceledDetails_Plural".GetLocalized() : "StatusMoveCanceledDetails_Plural2".GetLocalized()
@@ -739,7 +739,7 @@ public async Task<ReturnResult> MoveItemsAsync(IEnumerable<IStorageItemWithPath>
739739

740740
public async Task<ReturnResult> MoveItemAsync(IStorageItemWithPath source, string destination, bool showDialog, bool registerHistory)
741741
{
742-
PostedStatusBanner banner = statusCenterViewModel.PostBanner(
742+
PostedStatusBanner banner = OngoingTasksViewModel.PostBanner(
743743
string.Empty,
744744
associatedInstance.FilesystemViewModel.WorkingDirectory,
745745
0,
@@ -794,7 +794,7 @@ public async Task<ReturnResult> MoveItemAsync(IStorageItemWithPath source, strin
794794

795795
if (sw.Elapsed.TotalSeconds >= 10)
796796
{
797-
statusCenterViewModel.PostBanner(
797+
OngoingTasksViewModel.PostBanner(
798798
"StatusMoveComplete".GetLocalized(),
799799
"StatusOperationCompleted".GetLocalized(),
800800
0,

‎Files/Helpers/PostBannerHelpers.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Files.Helpers
77
{
88
public static class PostBannerHelpers
99
{
10-
private static StatusCenterViewModel statusCenterViewModel => statusCenterViewModel;
10+
private static OngoingTasksViewModel OngoingTasksViewModel => OngoingTasksViewModel;
1111

1212
public static void PostBanner_Delete(ReturnResult status, FileOperationType operation, Stopwatch sw, IShellPage associatedInstance)
1313
{
@@ -18,7 +18,7 @@ public static void PostBanner_Delete(ReturnResult status, FileOperationType oper
1818
{
1919
if (status == ReturnResult.AccessUnauthorized)
2020
{
21-
statusCenterViewModel.PostBanner(
21+
OngoingTasksViewModel.PostBanner(
2222
"AccessDeniedDeleteDialog/Title".GetLocalized(),
2323
"AccessDeniedDeleteDialog/Text".GetLocalized(),
2424
0,
@@ -27,7 +27,7 @@ public static void PostBanner_Delete(ReturnResult status, FileOperationType oper
2727
}
2828
else if (status == ReturnResult.IntegrityCheckFailed)
2929
{
30-
statusCenterViewModel.PostBanner(
30+
OngoingTasksViewModel.PostBanner(
3131
"FileNotFoundDialog/Title".GetLocalized(),
3232
"FileNotFoundDialog/Text".GetLocalized(),
3333
0,
@@ -36,7 +36,7 @@ public static void PostBanner_Delete(ReturnResult status, FileOperationType oper
3636
}
3737
else if (status == ReturnResult.Failed || status == ReturnResult.UnknownException)
3838
{
39-
statusCenterViewModel.PostBanner(
39+
OngoingTasksViewModel.PostBanner(
4040
"StatusDeletionFailed".GetLocalized(),
4141
"StatusUnknownError".GetLocalized(),
4242
0,
@@ -47,7 +47,7 @@ public static void PostBanner_Delete(ReturnResult status, FileOperationType oper
4747
{
4848
if (operation == FileOperationType.Delete)
4949
{
50-
statusCenterViewModel.PostBanner(
50+
OngoingTasksViewModel.PostBanner(
5151
"StatusDeletionComplete".GetLocalized(),
5252
"StatusOperationCompleted".GetLocalized(),
5353
0,
@@ -56,7 +56,7 @@ public static void PostBanner_Delete(ReturnResult status, FileOperationType oper
5656
}
5757
else if (operation == FileOperationType.Recycle)
5858
{
59-
statusCenterViewModel.PostBanner(
59+
OngoingTasksViewModel.PostBanner(
6060
"StatusRecycleComplete".GetLocalized(),
6161
"StatusOperationCompleted".GetLocalized(),
6262
0,

‎Files/Helpers/ResourceHelpers.cs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
using Windows.ApplicationModel.Resources;
7+
using Windows.UI.Xaml.Markup;
8+
9+
namespace Files.Helpers
10+
{
11+
[MarkupExtensionReturnType(ReturnType = typeof(string))]
12+
public sealed class ResourceString : MarkupExtension
13+
{
14+
private static ResourceLoader resourceLoader = ResourceLoader.GetForCurrentView();
15+
16+
public string Name
17+
{
18+
get; set;
19+
}
20+
21+
protected override object ProvideValue()
22+
{
23+
return resourceLoader.GetString(this.Name);
24+
}
25+
}
26+
}

‎Files/Interacts/BaseLayoutCommandImplementationModel.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ public async void DecompressArchive()
655655
}
656656

657657
CancellationTokenSource extractCancellation = new CancellationTokenSource();
658-
PostedStatusBanner banner = App.StatusCenterViewModel.PostOperationBanner(
658+
PostedStatusBanner banner = App.OngoingTasksViewModel.PostOperationBanner(
659659
string.Empty,
660660
"ExtractingArchiveText".GetLocalized(),
661661
0,
@@ -682,7 +682,7 @@ public async void DecompressArchive()
682682

683683
if (sw.Elapsed.TotalSeconds >= 6)
684684
{
685-
App.StatusCenterViewModel.PostBanner(
685+
App.OngoingTasksViewModel.PostBanner(
686686
"ExtractingCompleteText".GetLocalized(),
687687
"ArchiveExtractionCompletedSuccessfullyText".GetLocalized(),
688688
0,
@@ -706,7 +706,7 @@ public async void DecompressArchiveHere()
706706
if (archive != null && currentFolder != null)
707707
{
708708
CancellationTokenSource extractCancellation = new CancellationTokenSource();
709-
PostedStatusBanner banner = App.StatusCenterViewModel.PostOperationBanner(
709+
PostedStatusBanner banner = App.OngoingTasksViewModel.PostOperationBanner(
710710
string.Empty,
711711
"ExtractingArchiveText".GetLocalized(),
712712
0,
@@ -724,7 +724,7 @@ public async void DecompressArchiveHere()
724724

725725
if (sw.Elapsed.TotalSeconds >= 6)
726726
{
727-
App.StatusCenterViewModel.PostBanner(
727+
App.OngoingTasksViewModel.PostBanner(
728728
"ExtractingCompleteText".GetLocalized(),
729729
"ArchiveExtractionCompletedSuccessfullyText".GetLocalized(),
730730
0,
@@ -748,7 +748,7 @@ public async void DecompressArchiveToChildFolder()
748748
if (archive != null && destinationFolder != null)
749749
{
750750
CancellationTokenSource extractCancellation = new CancellationTokenSource();
751-
PostedStatusBanner banner = App.StatusCenterViewModel.PostOperationBanner(
751+
PostedStatusBanner banner = App.OngoingTasksViewModel.PostOperationBanner(
752752
string.Empty,
753753
"ExtractingArchiveText".GetLocalized(),
754754
0,
@@ -766,7 +766,7 @@ public async void DecompressArchiveToChildFolder()
766766

767767
if (sw.Elapsed.TotalSeconds >= 6)
768768
{
769-
App.StatusCenterViewModel.PostBanner(
769+
App.OngoingTasksViewModel.PostBanner(
770770
"ExtractingCompleteText".GetLocalized(),
771771
"ArchiveExtractionCompletedSuccessfullyText".GetLocalized(),
772772
0,

‎Files/Interacts/IStatusCenterActions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace Files.Interacts
77
{
8-
public interface IStatusCenterActions
8+
public interface IOngoingTasksActions
99
{
1010
event EventHandler<PostedStatusBanner> ProgressBannerPosted;
1111

0 commit comments

Comments
 (0)