Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Announcing removing widgets from dashboard #2537

Merged
merged 4 commits into from
Apr 8, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Views/ShellPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
from reading the control value. -->
<TextBlock Width="0" Height="0" IsTabStop="False" Text="{x:Bind ViewModel.AnnouncementText, Mode=OneWay}">
<i:Interaction.Behaviors>
<behaviors:TextBlockAutomationBehavior RaiseLiveRegionChangedEvent="True" LiveSetting="Polite" />
<behaviors:TextBlockAutomationBehavior RaiseLiveRegionChangedEvent="True" LiveSetting="Assertive" />
</i:Interaction.Behaviors>
</TextBlock>
</Grid>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ private async void OnRemoveWidgetClick(object sender, RoutedEventArgs e)
var widgetIdToDelete = widgetViewModel.Widget.Id;
var widgetToDelete = widgetViewModel.Widget;
_log.Debug($"User removed widget, delete widget {widgetIdToDelete}");
widgetViewModel.AnnounceDeleted();
DashboardView.PinnedWidgets.Remove(widgetViewModel);
try
{
Expand Down
65 changes: 64 additions & 1 deletion tools/Dashboard/DevHome.Dashboard/Strings/en-us/Resources.resw
Original file line number Diff line number Diff line change
@@ -1,5 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

Version 2.0

The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.

Example:

... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>

There are any number of "resheader" rows that contain simple
name/value pairs.

Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.

The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:

Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.

mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
Expand Down Expand Up @@ -190,4 +249,8 @@
<value>Close</value>
<comment>Text for a button to close a content dialog.</comment>
</data>
</root>
<data name="WidgetRemoved" xml:space="preserve">
<value>Widget removed</value>
<comment>This is said by narrator whenever a widget is removed</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public partial class WidgetViewModel : ObservableObject

private readonly WindowEx _windowEx;
private readonly WidgetAdaptiveCardRenderingService _renderingService;
private readonly IScreenReaderService _screenReaderService;

private RenderedAdaptiveCard _renderedCard;

Expand Down Expand Up @@ -98,9 +99,11 @@ public WidgetViewModel(
WidgetSize widgetSize,
WidgetDefinition widgetDefinition,
WidgetAdaptiveCardRenderingService adaptiveCardRenderingService,
IScreenReaderService screenReaderService,
WindowEx windowEx)
{
_renderingService = adaptiveCardRenderingService;
_screenReaderService = screenReaderService;
_windowEx = windowEx;

Widget = widget;
Expand Down Expand Up @@ -329,6 +332,12 @@ private async void HandleAdaptiveAction(RenderedAdaptiveCard sender, AdaptiveAct
// https://github.com/microsoft/devhome/issues/644
}

public void AnnounceDeleted()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know it's gross to Application.Current.GetService the ScreenReaderService in WidgetControl, but can we do this there?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

{
var stringResource = new StringResource("DevHome.Dashboard.pri", "DevHome.Dashboard/Resources");
_screenReaderService.Announce(stringResource.GetLocalized("WidgetRemoved"));
}

private async void HandleWidgetUpdated(Widget sender, WidgetUpdatedEventArgs args)
{
_log.Debug($"HandleWidgetUpdated for widget {sender.Id}");
Expand Down
Loading