Skip to content

Commit dad84e4

Browse files
committed
Better naming
1 parent 34776f1 commit dad84e4

File tree

8 files changed

+33
-33
lines changed

8 files changed

+33
-33
lines changed

app/SharedWebComponents/Components/VoiceDialog.razor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public sealed partial class VoiceDialog : IDisposable
1212

1313
[Inject] public required ISpeechSynthesisService SpeechSynthesis { get; set; }
1414

15-
[Inject] public required IVoiceChangesListener VoiceChangesListener { get; set; }
15+
[Inject] public required ITextToSpeechPreferencesListener VoiceChangesListener { get; set; }
1616

1717
[Inject] public required ILocalStorageService LocalStorage { get; set; }
1818

@@ -24,7 +24,7 @@ protected override async Task OnInitializedAsync()
2424

2525
await GetVoicesAsync();
2626

27-
VoiceChangesListener.OnListenForVoiceChanges(() => GetVoicesAsync(true));
27+
VoiceChangesListener.OnAvailableVoicesChanged(() => GetVoicesAsync(true));
2828

2929
_voicePreferences = new VoicePreferences(LocalStorage);
3030

@@ -60,7 +60,7 @@ private void OnValueChanged(string selectedVoice) => _voicePreferences = _voiceP
6060

6161
public void Dispose()
6262
{
63-
VoiceChangesListener.UnsubscribeFromVoiceChanges();
63+
VoiceChangesListener.UnsubscribeFromAvailableVoicesChanged();
6464
}
6565
}
6666

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright (c) Microsoft. All rights reserved.
2+
3+
namespace SharedWebComponents.Services;
4+
5+
public interface ITextToSpeechPreferencesListener
6+
{
7+
void OnAvailableVoicesChanged(Func<Task> onVoicesChanged);
8+
9+
void UnsubscribeFromAvailableVoicesChanged();
10+
}

app/SharedWebComponents/Services/IVoiceChangesListener.cs

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

app/frontend/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
builder.Services.AddSessionStorageServices();
1919
builder.Services.AddSpeechSynthesisServices();
2020
builder.Services.AddSpeechRecognitionServices();
21-
builder.Services.AddSingleton<IVoiceChangesListener, VoiceChangesListenerService>();
21+
builder.Services.AddSingleton<ITextToSpeechPreferencesListener, TextToSpeechPreferencesListenerService>();
2222
builder.Services.AddMudServices();
2323
builder.Services.AddTransient<IPdfViewer, WebPdfViewer>();
2424

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright (c) Microsoft. All rights reserved.
2+
3+
using Microsoft.JSInterop;
4+
5+
namespace ClientApp.Services;
6+
7+
public sealed class TextToSpeechPreferencesListenerService(
8+
ISpeechSynthesisService speechSynthesisService) : ITextToSpeechPreferencesListener
9+
{
10+
public void OnAvailableVoicesChanged(Func<Task> onVoicesChanged) =>
11+
speechSynthesisService.OnVoicesChanged(onVoicesChanged);
12+
13+
public void UnsubscribeFromAvailableVoicesChanged() =>
14+
speechSynthesisService.UnsubscribeFromVoicesChanged();
15+
}

app/frontend/Services/VoiceChangesListenerService.cs

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

app/maui-blazor/MauiProgram.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static MauiApp CreateMauiApp()
3333
builder.Services.AddSingleton<ISessionStorageService, MauiSessionStorageService>();
3434
builder.Services.AddSingleton<ISpeechRecognitionService, MauiSpeechRecognitionService>();
3535
builder.Services.AddSingleton<ISpeechSynthesisService, MauiSpeechSynthesisService>();
36-
builder.Services.AddSingleton<IVoiceChangesListener, MauiSpeechSynthesisService>();
36+
builder.Services.AddSingleton<ITextToSpeechPreferencesListener, MauiSpeechSynthesisService>();
3737
builder.Services.AddTransient<IPdfViewer, MauiPdfViewer>();
3838

3939
builder.Services.AddMudServices();

app/maui-blazor/Services/MauiSpeechSynthesisService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace MauiBlazor.Services;
44

55
public class MauiSpeechSynthesisService(ITextToSpeech textToSpeech)
6-
: ISpeechSynthesisService, IVoiceChangesListener
6+
: ISpeechSynthesisService, ITextToSpeechPreferencesListener
77
{
88
private CancellationTokenSource? _cts;
99
private Task? _speakTask;
@@ -30,7 +30,7 @@ public ValueTask<SpeechSynthesisVoice[]> GetVoicesAsync()
3030
return ValueTask.FromResult<SpeechSynthesisVoice[]>([voice]);
3131
}
3232

33-
public void OnListenForVoiceChanges(Func<Task> onVoicesChanged)
33+
public void OnAvailableVoicesChanged(Func<Task> onVoicesChanged)
3434
{
3535
_ = onVoicesChanged;
3636
}
@@ -84,7 +84,7 @@ public void Speak(SpeechSynthesisUtterance utterance)
8484
}, _cts.Token);
8585
}
8686

87-
public void UnsubscribeFromVoiceChanges()
87+
public void UnsubscribeFromAvailableVoicesChanged()
8888
{
8989

9090
}

0 commit comments

Comments
 (0)