Speech recog moved to community toolkit

shinyorg · Mar 15, 2024 · 6bd7aab · 6bd7aab
1 parent 8da73ea
commit 6bd7aab
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/ProjectTemplates/ShinyApp/.template.config/ide.host.json b/ProjectTemplates/ShinyApp/.template.config/ide.host.json
@@ -140,7 +140,7 @@
     {
         "id": "speechrecognition",
         "name": {
-            "text": "Add Speech Recognition (Shiny.SpeechRecognition)"
+            "text": "Setup Community Toolkit Speech-to-Text"
         },
         "isVisible": true,
         "defaultValue": "None"

diff --git a/ProjectTemplates/ShinyApp/.template.config/template.json b/ProjectTemplates/ShinyApp/.template.config/template.json
@@ -166,13 +166,6 @@
             "description": "Add Local Notifications (Shiny.Notifications)",
             "displayName": "Add Local Notifications (Shiny.Notifications)"
         },
-        "speechrecognition": {
-            "type": "parameter",
-            "datatype": "bool",
-            "defaultValue": "false",
-            "description": "Add Speech Recognition (Shiny.SpeechRecognition)",
-            "displayName": "Add Speech Recognition (Shiny.SpeechRecognition)"
-        },
         "health":{
             "type": "parameter",
             "datatype": "bool",
@@ -324,6 +317,13 @@
             "description": "MAUI Community Toolkit - Documentation https://learn.microsoft.com/en-us/dotnet/communitytoolkit/maui/",
             "displayName": "Add MAUI Community Toolkit"
         },
+        "speechrecognition": {
+            "type": "parameter",
+            "datatype": "bool",
+            "defaultValue": "false",
+            "description": "Setup Community Toolkit Speech-to-Text",
+            "displayName": "Setup Community Toolkit Speech-to-Text"
+        },        
         "mediaelement":{
             "type": "parameter",
             "datatype": "bool",

diff --git a/ProjectTemplates/ShinyApp/MauiProgram.cs b/ProjectTemplates/ShinyApp/MauiProgram.cs
@@ -93,7 +93,7 @@ public static MauiApp CreateMauiApp() => MauiApp
 #if shinyframework            
         .UseShinyFramework(
             new DryIocContainerExtension(),
-            prism => prism.OnAppStart("NavigationPage/MainPage"),
+            prism => prism.CreateWindow("NavigationPage/MainPage"),
             new (
 //-:cnd:noEmit
 #if DEBUG

diff --git a/ProjectTemplates/ShinyApp/ShinyApp.csproj b/ProjectTemplates/ShinyApp/ShinyApp.csproj
@@ -146,14 +146,14 @@
 		<!--#endif-->
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" Condition="'$(Configuration)' == 'Debug'" />
 
-		<!--#if (shinyframework || communitytoolkit)-->
+		<!--#if (shinyframework || communitytoolkit || speechrecognition)-->
 		<PackageReference Include="CommunityToolkit.Maui" Version="7.0.1" />
 		<!--#endif-->
 		<!--#if (usecsharpmarkup)-->
 		<PackageReference Include="CommunityToolkit.Maui.Markup" Version="4.0.0" />
 		<!--#endif-->
 		<!--#if (mediaelement)-->
-		<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="3.0.1" />
+		<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="3.1.0" />
 		<!--#endif-->
 		<!--#if (usemauimaps)-->
 		<PackageReference Include="Microsoft.Maui.Controls.Maps" Version="$(MauiVersion)" />
@@ -162,9 +162,9 @@
 		<PackageReference Include="Onion.Maui.GoogleMaps" Version="5.0.1" />
 		<!--#endif-->
 		<!--#if (shinyframework)-->
-		<PackageReference Include="Prism.DryIoc.Maui" Version="9.0.271-pre" />
+		<PackageReference Include="Prism.DryIoc.Maui" Version="9.0.401-pre" />
 		<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
-		<PackageReference Include="Shiny.Framework" Version="4.0.0" />
+		<PackageReference Include="Shiny.Framework" Version="4.1.0" />
 		<!--#else-->
 		<PackageReference Include="Shiny.Core" Version="$(ShinyVersion)" />
 		<PackageReference Include="Shiny.Hosting.Maui" Version="$(ShinyVersion)" />
@@ -206,9 +206,6 @@
 		<!--#if (httptransfers)-->
 		<PackageReference Include="Shiny.Net.Http" Version="$(ShinyVersion)" />
 		<!--#endif-->
-		<!--#if (speechrecognition)-->
-		<PackageReference Include="Shiny.SpeechRecognition" Version="$(ShinyVersion)" />
-		<!--#endif-->
 		<!--#if (usepushnative)-->
 		<PackageReference Include="Shiny.Push" Version="$(ShinyVersion)" />
 		<!--#endif-->