Skip to content

Commit c743049

Browse files
authored
Revert template changes (#31301)
* Remove AnnouncementHelper * - fix async
1 parent 2e9707c commit c743049

File tree

7 files changed

+10
-107
lines changed

7 files changed

+10
-107
lines changed

src/Templates/src/templates/maui-mobile/.template.config/template.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
"Services/**",
7575
"Resources/Styles/AppStyles.xaml",
7676
"Utilities/**",
77-
"Platforms/iOS/SemanticScreenReaderAsyncImplementation.cs"
7877
]
7978
},
8079
{

src/Templates/src/templates/maui-mobile/MauiProgram.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ public static MauiApp CreateMauiApp()
5050
builder.Services.AddSingleton<MainPageModel>();
5151
builder.Services.AddSingleton<ProjectListPageModel>();
5252
builder.Services.AddSingleton<ManageMetaPageModel>();
53-
#if IOS
54-
builder.Services.AddSingleton<IAsyncAnnouncement, SemanticScreenReaderAsyncImplementation>();
55-
#endif
5653

5754
builder.Services.AddTransientWithShellRoute<ProjectDetailPage, ProjectDetailPageModel>("project");
5855
builder.Services.AddTransientWithShellRoute<TaskDetailPage, TaskDetailPageModel>("task");

src/Templates/src/templates/maui-mobile/PageModels/ManageMetaPageModel.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private async Task SaveCategories()
4747
}
4848

4949
await AppShell.DisplayToastAsync("Categories saved");
50-
await AnnouncementHelper.Announce("Categories saved");
50+
SemanticScreenReader.Announce("Categories saved");
5151
}
5252

5353
[RelayCommand]
@@ -56,7 +56,7 @@ private async Task DeleteCategory(Category category)
5656
Categories.Remove(category);
5757
await _categoryRepository.DeleteItemAsync(category);
5858
await AppShell.DisplayToastAsync("Category deleted");
59-
await AnnouncementHelper.Announce("Category deleted");
59+
SemanticScreenReader.Announce("Category deleted");
6060
}
6161

6262
[RelayCommand]
@@ -66,7 +66,7 @@ private async Task AddCategory()
6666
Categories.Add(category);
6767
await _categoryRepository.SaveItemAsync(category);
6868
await AppShell.DisplayToastAsync("Category added");
69-
await AnnouncementHelper.Announce("Category added");
69+
SemanticScreenReader.Announce("Category added");
7070
}
7171

7272
[RelayCommand]
@@ -78,7 +78,7 @@ private async Task SaveTags()
7878
}
7979

8080
await AppShell.DisplayToastAsync("Tags saved");
81-
await AnnouncementHelper.Announce("Tags saved");
81+
SemanticScreenReader.Announce("Tags saved");
8282
}
8383

8484
[RelayCommand]
@@ -87,7 +87,7 @@ private async Task DeleteTag(Tag tag)
8787
Tags.Remove(tag);
8888
await _tagRepository.DeleteItemAsync(tag);
8989
await AppShell.DisplayToastAsync("Tag deleted");
90-
await AnnouncementHelper.Announce("Tags deleted");
90+
SemanticScreenReader.Announce("Tags deleted");
9191
}
9292

9393
[RelayCommand]
@@ -97,7 +97,7 @@ private async Task AddTag()
9797
Tags.Add(tag);
9898
await _tagRepository.SaveItemAsync(tag);
9999
await AppShell.DisplayToastAsync("Tag added");
100-
await AnnouncementHelper.Announce("Tags added");
100+
SemanticScreenReader.Announce("Tags added");
101101
}
102102

103103
[RelayCommand]

src/Templates/src/templates/maui-mobile/PageModels/ProjectDetailPageModel.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,13 @@ private async Task ToggleTag(Tag tag)
259259
{
260260
await _tagRepository.SaveItemAsync(tag, _project.ID);
261261
AllTags = new(AllTags);
262-
await AnnouncementHelper.Announce($"{tag.Title} selected");
262+
SemanticScreenReader.Announce($"{tag.Title} selected");
263263
}
264264
else
265265
{
266266
await _tagRepository.DeleteItemAsync(tag, _project.ID);
267267
AllTags = new(AllTags);
268-
await AnnouncementHelper.Announce($"{tag.Title} unselected");
268+
SemanticScreenReader.Announce($"{tag.Title} unselected");
269269
}
270270
}
271271
else
@@ -275,9 +275,9 @@ private async Task ToggleTag(Tag tag)
275275
}
276276

277277
[RelayCommand]
278-
private async Task IconSelected(IconData icon)
278+
private void IconSelected(IconData icon)
279279
{
280-
await AnnouncementHelper.Announce($"{icon.Description} selected");
280+
SemanticScreenReader.Announce($"{icon.Description} selected");
281281
}
282282

283283
[RelayCommand]

src/Templates/src/templates/maui-mobile/Platforms/iOS/SemanticScreenReaderAsyncImplementation.cs

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

src/Templates/src/templates/maui-mobile/Services/AnnouncementHelper.cs

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

src/Templates/src/templates/maui-mobile/Services/IAsyncAnnouncement.cs

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

0 commit comments

Comments
 (0)