Add cross-platform support via AdaptiveRemote.Core project #24
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Razor"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <RootNamespace>AdaptiveRemote</RootNamespace> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Remove="Services\Conversation\static_grammar.xml" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <EmbeddedResource Include="Services\Conversation\static_grammar.xml" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.2" /> | ||
| <PackageReference Include="Azure.Identity" Version="1.11.4" /> | ||
| <PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.2.0" /> | ||
| <PackageReference Include="I8Beef.TiVo" Version="1.0.0.14" /> | ||
| <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.14" /> | ||
| <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" /> | ||
| <PackageReference Include="Nerdbank.GitVersioning" Version="3.9.50"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.8.1" /> | ||
| <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" /> | ||
| <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" /> | ||
| <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" /> | ||
| <PackageReference Include="System.Text.Json" Version="8.0.5" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Compile Update="Logging\LoggingMessages.Designer.cs"> | ||
| <DesignTime>True</DesignTime> | ||
| <AutoGen>True</AutoGen> | ||
| <DependentUpon>LoggingMessages.resx</DependentUpon> | ||
| </Compile> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <EmbeddedResource Update="Logging\LoggingMessages.resx"> | ||
| <Generator>ResXFileCodeGenerator</Generator> | ||
| <LastGenOutput>LoggingMessages.Designer.cs</LastGenOutput> | ||
| </EmbeddedResource> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,6 @@ | |
| using Microsoft.Extensions.Configuration; | ||
| using Microsoft.Extensions.DependencyInjection; | ||
| using Microsoft.Extensions.Hosting; | ||
|
|
||
| namespace AdaptiveRemote.Configuration; | ||
|
|
||
|
|
@@ -17,36 +16,18 @@ internal static IServiceCollection AddConversationServices(this IServiceCollecti | |
| .AddScopedLifecycleService<ConversationController>() | ||
| .AddScoped<ISpeechRecognition, SpeechRecognition>() | ||
| .AddScoped<ISpeechSynthesis, SpeechSynthesis>() | ||
| .AddScoped<ConversationStateMachine>() | ||
| .AddSingleton<IListeningController, ListeningController>() | ||
| .AddScoped(GetConversationViewModel); | ||
|
|
||
| internal static IServiceCollection AddConversationServices(this IServiceCollection services, IConfiguration config) | ||
| => services | ||
| .AddConversationServices() | ||
|
Owner
There was a problem hiding this comment. OptionallyAddFakeSpeechRecognition and OptionallyAddSamplesRecorder shouldn't be removed. They're not related to the "Fakes" that were added for Electron. Rather, this is simulated speech and diagnostics that are used for testing without having to speak commands out loud.
Contributor
Author
There was a problem hiding this comment. Fixed in 86c391a - restored FakeSpeechRecognitionEngine and SamplesRecorder support. The Windows project now registers |
||
| .Configure<ConversationSettings>(config); | ||
|
|
||
| private static Models.ConversationView GetConversationViewModel(IServiceProvider provider) | ||
| { | ||
| IRemoteDefinitionService definition = provider.GetRequiredService<IRemoteDefinitionService>(); | ||
| return definition.GetElement<Models.ConversationView>(); | ||
| } | ||
|
Owner
There was a problem hiding this comment. Note to self: Find out where this went |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| using AdaptiveRemote.Models; | ||
| using AdaptiveRemote.Services; | ||
| using AdaptiveRemote.Services.Lifecycle; | ||
| using Microsoft.Extensions.DependencyInjection; | ||
| using Microsoft.Extensions.Hosting; | ||
|
|
||
| namespace AdaptiveRemote.Configuration; | ||
|
|
||
| /// <summary> | ||
| /// Public extension methods for configuring the cross-platform app | ||
| /// </summary> | ||
| public static class CoreHostBuilderExtensions | ||
| { | ||
| /// <summary> | ||
| /// Configures the core application services shared by all hosts | ||
| /// </summary> | ||
| public static IHostBuilder ConfigureCoreApp(this IHostBuilder hostBuilder) | ||
| => hostBuilder | ||
| .ConfigureTelemetry() | ||
| .AddRemoteServices() | ||
| .AddBroadlinkSupport() | ||
| .AddTiVoSupport() | ||
| .AddConversationSystem() | ||
| .AddSystemWrapperServices(); | ||
|
|
||
| /// <summary> | ||
| /// Adds the lifecycle view model and controller for hosting | ||
| /// </summary> | ||
| public static IServiceCollection AddLifecycleServices(this IServiceCollection services, LifecycleView lifecycleView, ILifecycleViewController lifecycleController) | ||
| { | ||
| services.AddSingleton(lifecycleView); | ||
| services.AddSingleton(lifecycleController); | ||
| return services; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| using System.Runtime.CompilerServices; | ||
|
|
||
| [assembly: InternalsVisibleTo("AdaptiveRemote")] | ||
| [assembly: InternalsVisibleTo("AdaptiveRemote.Core.Tests")] | ||
| [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] | ||
| [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| namespace AdaptiveRemote.Services.Conversation; | ||
|
|
||
| /// <summary> | ||
| /// Platform-independent grammar interface that abstracts System.Speech.Recognition.Grammar | ||
| /// </summary> | ||
| public interface IGrammar | ||
| { | ||
| /// <summary> | ||
| /// Gets or sets the name of the grammar. | ||
| /// </summary> | ||
| string Name { get; } | ||
|
|
||
| /// <summary> | ||
| /// Gets or sets whether the grammar is enabled for recognition. | ||
| /// </summary> | ||
| bool Enabled { get; set; } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| namespace AdaptiveRemote.Services.Conversation; | ||
|
|
||
| /// <summary> | ||
| /// Loader for Grammar objects | ||
| /// </summary> | ||
| public interface IGrammarProvider | ||
| { | ||
| /// <summary> | ||
| /// Load a grammar that supports the given kind of phrases | ||
| /// </summary> | ||
| IGrammar LoadGrammar(PhraseKinds phraseKind); | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| namespace AdaptiveRemote.Services.Conversation; | ||
|
|
||
| [Flags] | ||
| public enum PhraseKinds | ||
| { | ||
| WakeWord = 1, | ||
| Commands = 2, | ||
|
|
||
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I like that the root namespace is still
AdaptiveRemoteand notAdaptiveRemote.Core. However, I think the generated Blazor component code is going to useAdaptiveRemote.Corefor its namespaces. If it's possible, I want that to be configured asAdaptiveRemotenamespace as well.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Already configured correctly - the Core csproj has
<RootNamespace>AdaptiveRemote</RootNamespace>which means Blazor components inComponents/folder are generated with namespaceAdaptiveRemote.Components, notAdaptiveRemote.Core.Components.