Update sample

CommunityToolkit · Nov 2, 2024 · 7ddd7fe · 7ddd7fe
1 parent fd3e1fb
commit 7ddd7fe
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 107 deletions.
diff --git a/samples/CommunityToolkit.Maui.Sample.sln b/samples/CommunityToolkit.Maui.Sample.sln
@@ -14,7 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\.editorconfig = ..\.editorconfig
 		..\Directory.Build.props = ..\Directory.Build.props
 		..\Directory.Build.targets = ..\Directory.Build.targets
-		..\global.json = ..\global.json
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Maui.Core", "..\src\CommunityToolkit.Maui.Core\CommunityToolkit.Maui.Core.csproj", "{6B572EAD-1581-46BE-A08B-1C7F2246BA2E}"
@@ -51,7 +50,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Maui.Camer
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks", "{ED5A9C0B-D270-442D-BABE-F4FF622926C8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Maui.Analyzers.Benchmarks.csproj", "..\src\CommunityToolkit.Maui.Analyzers.Benchmarks\CommunityToolkit.Maui.Analyzers.Benchmarks.csproj", "{B80F59B7-276C-4A55-A8DD-54587C8BC3D2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Maui.Analyzers.Benchmarks", "..\src\CommunityToolkit.Maui.Analyzers.Benchmarks\CommunityToolkit.Maui.Analyzers.Benchmarks.csproj", "{B80F59B7-276C-4A55-A8DD-54587C8BC3D2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/OfflineSpeechToTextPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/OfflineSpeechToTextPage.xaml
@@ -9,28 +9,15 @@
                 x:DataType="vm:OfflineSpeechToTextViewModel"
                 Title="OfflineSpeechToText">
 
-    <ContentPage.Resources>
-        <essentials:PickerLocaleDisplayConverter x:Key="PickerLocaleDisplayConverter" />
-    </ContentPage.Resources>
-
     <ScrollView>
         <VerticalStackLayout
             Spacing="20"
             Padding="30,0">
 
             <Label
-                Text="OfflineSpeechToText allows the user to convert speech to text in real time in offline"
+                Text="OfflineSpeechToText allows the user to convert speech to text in real time in offline."
                 HorizontalTextAlignment="Center"/>
 
-            <Label
-                Text="Locale"
-                FontAttributes="Bold"/>
-
-            <Picker
-                ItemsSource="{Binding Locales}"
-                SelectedItem="{Binding CurrentLocale}"
-                ItemDisplayBinding="{Binding ., Converter={StaticResource PickerLocaleDisplayConverter}}"/>
-
             <Label
                 Text="State"
                 FontAttributes="Bold"/>
@@ -53,11 +40,6 @@
                 HorizontalTextAlignment="Center"
                 MinimumHeightRequest="100" />
 
-            <Button
-                Text="Play"
-                Command="{Binding PlayCommand}"
-                HorizontalOptions="Center" />
-
             <Border
                 StrokeThickness="2"
                 Stroke="#808080"

diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/OfflineSpeechToTextPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Essentials/OfflineSpeechToTextPage.xaml.cs
@@ -1,6 +1,4 @@
-using System.Globalization;
-using CommunityToolkit.Maui.Converters;
-using CommunityToolkit.Maui.Sample.ViewModels.Essentials;
+using CommunityToolkit.Maui.Sample.ViewModels.Essentials;
 
 namespace CommunityToolkit.Maui.Sample.Pages.Essentials;
 
@@ -10,11 +8,4 @@ public OfflineSpeechToTextPage(OfflineSpeechToTextViewModel viewModel) : base(vi
 	{
 		InitializeComponent();
 	}
-
-	protected override async void OnAppearing()
-	{
-		base.OnAppearing();
-
-		await BindingContext.SetLocalesCommand.ExecuteAsync(null);
-	}
 }
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/OfflineSpeechToTextViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Essentials/OfflineSpeechToTextViewModel.cs
@@ -1,5 +1,3 @@
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
 using System.Globalization;
 using CommunityToolkit.Maui.Alerts;
 using CommunityToolkit.Maui.Media;
@@ -10,83 +8,25 @@ namespace CommunityToolkit.Maui.Sample.ViewModels.Essentials;
 
 public partial class OfflineSpeechToTextViewModel : BaseViewModel
 {
-	const string defaultLanguage = "en-US";
-	const string defaultLanguageAndroid = "en";
-	const string defaultLanguageTizen = "en_US";
-
-	readonly ITextToSpeech textToSpeech;
 	readonly ISpeechToText speechToText;
 
-	[ObservableProperty]
-	Locale? currentLocale;
-
 	public SpeechToTextState? State => speechToText.CurrentState;
 
 	[ObservableProperty]
 	string? recognitionText = "Welcome to .NET MAUI Community Toolkit!";
 
-	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(StartListenCommand))]
-	bool canStartListenExecute = true;
-
-	[ObservableProperty, NotifyCanExecuteChangedFor(nameof(StopListenCommand))]
-	bool canStopListenExecute;
-
-	public OfflineSpeechToTextViewModel(ITextToSpeech textToSpeech)
+	public OfflineSpeechToTextViewModel()
 	{
-		this.textToSpeech = textToSpeech;
 		// For demo purposes. You can resolve dependency from the DI container,
-		this.speechToText = OfflineSpeechToText.Default;
-
-		Locales.CollectionChanged += HandleLocalesCollectionChanged;
-		this.speechToText.StateChanged += HandleSpeechToTextStateChanged;
-		this.speechToText.RecognitionResultCompleted += HandleRecognitionResultCompleted;
-	}
-
-	public ObservableCollection<Locale> Locales { get; } = [];
-
-	[RelayCommand]
-	async Task SetLocales(CancellationToken token)
-	{
-		Locales.Clear();
-
-		var locales = await textToSpeech.GetLocalesAsync().WaitAsync(token);
-
-		foreach (var locale in locales.OrderBy(x => x.Language).ThenBy(x => x.Name))
-		{
-			Locales.Add(locale);
-		}
+		speechToText = OfflineSpeechToText.Default;
 
-		CurrentLocale = Locales.FirstOrDefault(x => x.Language is defaultLanguage or defaultLanguageAndroid or defaultLanguageTizen) ?? Locales.FirstOrDefault();
+		speechToText.StateChanged += HandleSpeechToTextStateChanged;
+		speechToText.RecognitionResultCompleted += HandleRecognitionResultCompleted;
 	}
 
 	[RelayCommand]
-	async Task Play(CancellationToken cancellationToken)
-	{
-		var timeoutCancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(5));
-
-		try
-		{
-			await textToSpeech.SpeakAsync(RecognitionText ?? "Welcome to .NET MAUI Community Toolkit!", new()
-			{
-				Locale = CurrentLocale,
-				Pitch = 1,
-				Volume = 1
-			}, cancellationToken).WaitAsync(timeoutCancellationTokenSource.Token);
-		}
-		catch (TaskCanceledException)
-		{
-			await Toast.Make("Playback automatically stopped after 5 seconds").Show(cancellationToken);
-#if IOS
-			await Toast.Make("If you did not hear playback, test again on a physical iOS device").Show(cancellationToken);
-#endif
-		}
-	}
-
-	[RelayCommand(CanExecute = nameof(CanStartListenExecute))]
 	async Task StartListen()
 	{
-		CanStartListenExecute = false;
-
 		var isGranted = await speechToText.RequestPermissions(CancellationToken.None);
 		if (!isGranted)
 		{
@@ -100,9 +40,9 @@ async Task StartListen()
 
 		speechToText.RecognitionResultUpdated += HandleRecognitionResultUpdated;
 
-		await speechToText.StartListenAsync(new SpeechToTextOptions()
+		await speechToText.StartListenAsync(new SpeechToTextOptions
 		{
-			Culture = CultureInfo.GetCultureInfo(CurrentLocale?.Language ?? defaultLanguage),
+			Culture = CultureInfo.CurrentCulture,
 			ShouldReportPartialResults = true
 		}, CancellationToken.None);
 
@@ -112,12 +52,9 @@ await speechToText.StartListenAsync(new SpeechToTextOptions()
 		}
 	}
 
-	[RelayCommand(CanExecute = nameof(CanStopListenExecute))]
+	[RelayCommand]
 	Task StopListen()
 	{
-		CanStartListenExecute = true;
-		CanStopListenExecute = false;
-
 		speechToText.RecognitionResultUpdated -= HandleRecognitionResultUpdated;
 
 		return speechToText.StopListenAsync(CancellationToken.None);
@@ -137,9 +74,4 @@ void HandleSpeechToTextStateChanged(object? sender, SpeechToTextStateChangedEven
 	{
 		OnPropertyChanged(nameof(State));
 	}
-
-	void HandleLocalesCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
-	{
-		OnPropertyChanged(nameof(CurrentLocale));
-	}
 }
diff --git a/...ityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.android.cs b/...ityToolkit.Maui.Core/Essentials/SpeechToText/OfflineSpeechToTextImplementation.android.cs
@@ -70,7 +70,6 @@ void InternalStartListening(SpeechToTextOptions options)
 		speechRecognizer = SpeechRecognizer.CreateOnDeviceSpeechRecognizer(Application.Context);
 		speechRecognizer.TriggerModelDownload(recognizerIntent);
 
-
 		listener = new SpeechRecognitionListener(this)
 		{
 			Error = HandleListenerError,