From 53224251a0b5845285e80f29161739dda7dd3685 Mon Sep 17 00:00:00 2001 From: Aaron Jackson Date: Tue, 21 Sep 2021 22:53:46 -0700 Subject: [PATCH 1/3] Refactor namespace to follow C# standards --- Scripts/Editor/BaseWitWindow.cs | 6 +- .../SimpleIntentHandlerEditor.cs | 5 +- .../SimpleStringEntityHandlerEditor.cs | 4 +- .../ValuePathMatcherPropertyDrawer.cs | 4 +- .../WitApplicationDetailProvider.cs | 42 ----- Scripts/Editor/{ => Data}/Configuration.meta | 0 .../IApplicationDetailProvider.cs | 3 +- .../IApplicationDetailProvider.cs.meta | 0 .../WitApplicationDetailProvider.cs | 42 +++++ .../WitApplicationDetailProvider.cs.meta | 0 .../Configuration/WitConfigurationEditor.cs | 15 +- .../WitConfigurationEditor.cs.meta | 0 .../Configuration/WitConfigurationUtility.cs | 10 +- .../WitConfigurationUtility.cs.meta | 0 .../{ => Data}/Configuration/WitWindow.cs | 4 +- .../Configuration/WitWindow.cs.meta | 0 Scripts/Editor/Data/WitDataCreation.cs | 7 +- Scripts/Editor/Inspectors/WitInspector.cs | 2 +- Scripts/Editor/Lib/Mic/MicEditor.cs | 2 +- .../Editor/Utility/EditorForegroundRunner.cs | 2 +- .../Editor/Utility/WitUnderstandingViewer.cs | 9 +- Scripts/Editor/WitEditorUI.cs | 2 +- Scripts/Editor/WitStyles.cs | 2 +- .../CallbackHandlers/SimpleIntentHandler.cs | 4 +- .../SimpleStringEntityHandler.cs | 4 +- .../CallbackHandlers/WitResponseHandler.cs | 4 +- .../CallbackHandlers/WitResponseMatcher.cs | 6 +- .../CallbackHandlers/WitUtteranceMatcher.cs | 7 +- Scripts/Runtime/Data/AudioEncoding.cs | 2 +- Scripts/Runtime/{ => Data}/Configuration.meta | 0 .../Configuration/WitApplication.cs | 5 +- .../Configuration/WitApplication.cs.meta | 0 .../Configuration/WitConfiguration.cs | 7 +- .../Configuration/WitConfiguration.cs.meta | 0 .../Configuration/WitConfigurationData.cs | 5 +- .../WitConfigurationData.cs.meta | 0 .../Configuration/WitRequestOptions.cs | 4 +- .../Configuration/WitRequestOptions.cs.meta | 0 .../Configuration/WitRuntimeConfiguration.cs | 5 +- .../WitRuntimeConfiguration.cs.meta | 0 Scripts/Runtime/Data/Entities.meta | 3 + .../Entities}/WitDynamicEntities.cs | 6 +- .../Entities}/WitDynamicEntities.cs.meta | 0 .../Entities}/WitDynamicEntity.cs | 6 +- .../Entities}/WitDynamicEntity.cs.meta | 0 .../Entities}/WitEntity.cs | 6 +- .../Entities}/WitEntity.cs.meta | 0 .../Entities}/WitSimpleDynamicEntity.cs | 6 +- .../Entities}/WitSimpleDynamicEntity.cs.meta | 0 Scripts/Runtime/Data/Intents.meta | 3 + .../Intents}/WitIntent.cs | 6 +- .../Intents}/WitIntent.cs.meta | 0 Scripts/Runtime/Data/Keywords.meta | 3 + .../Keywords}/WitKeyword.cs | 4 +- .../Keywords}/WitKeyword.cs.meta | 0 Scripts/Runtime/Data/RingBuffer.cs | 2 +- Scripts/Runtime/Data/Traits.meta | 3 + .../Traits}/WitTrait.cs | 5 +- .../Traits}/WitTrait.cs.meta | 0 .../Traits}/WitTraitValue.cs | 4 +- .../Traits}/WitTraitValue.cs.meta | 0 Scripts/Runtime/Data/WitFloatValue.cs | 4 +- Scripts/Runtime/Data/WitIntValue.cs | 4 +- Scripts/Runtime/Data/WitStringValue.cs | 4 +- Scripts/Runtime/Data/WitValue.cs | 4 +- Scripts/Runtime/Events/VoiceEvents.cs | 2 +- Scripts/Runtime/Events/WitErrorEvent.cs | 2 +- .../Runtime/Events/WitMicLevelChangedEvent.cs | 2 +- .../Runtime/Events/WitRequestCreatedEvent.cs | 2 +- Scripts/Runtime/Events/WitResponseEvent.cs | 4 +- .../Runtime/Events/WitTranscriptionEvent.cs | 2 +- .../Interfaces/CustomTranscriptionProvider.cs | 4 +- .../Runtime/Interfaces/IAudioInputSource.cs | 4 +- .../Interfaces/IDynamicEntitiesProvider.cs | 2 +- .../Interfaces/ITranscriptionProvider.cs | 4 +- Scripts/Runtime/Lib/Mic.cs | 6 +- Scripts/Runtime/Lib/WitResponse.cs | 3 +- .../Runtime/Utilities/FloatToStringEvent.cs | 2 +- Scripts/Runtime/VoiceService.cs | 14 +- Scripts/Runtime/Wit.cs | 9 +- Scripts/Runtime/WitAuthUtility.cs | 152 +++++++++--------- Scripts/Runtime/WitRequest.cs | 7 +- Scripts/Runtime/WitRequestFactory.cs | 9 +- Scripts/Runtime/WitResultUtilities.cs | 4 +- 84 files changed, 276 insertions(+), 245 deletions(-) delete mode 100644 Scripts/Editor/Configuration/WitApplicationDetailProvider.cs rename Scripts/Editor/{ => Data}/Configuration.meta (100%) rename Scripts/Editor/{ => Data}/Configuration/IApplicationDetailProvider.cs (81%) rename Scripts/Editor/{ => Data}/Configuration/IApplicationDetailProvider.cs.meta (100%) create mode 100644 Scripts/Editor/Data/Configuration/WitApplicationDetailProvider.cs rename Scripts/Editor/{ => Data}/Configuration/WitApplicationDetailProvider.cs.meta (100%) rename Scripts/Editor/{ => Data}/Configuration/WitConfigurationEditor.cs (98%) rename Scripts/Editor/{ => Data}/Configuration/WitConfigurationEditor.cs.meta (100%) rename Scripts/Editor/{ => Data}/Configuration/WitConfigurationUtility.cs (97%) rename Scripts/Editor/{ => Data}/Configuration/WitConfigurationUtility.cs.meta (100%) rename Scripts/Editor/{ => Data}/Configuration/WitWindow.cs (98%) rename Scripts/Editor/{ => Data}/Configuration/WitWindow.cs.meta (100%) rename Scripts/Runtime/{ => Data}/Configuration.meta (100%) rename Scripts/Runtime/{ => Data}/Configuration/WitApplication.cs (92%) rename Scripts/Runtime/{ => Data}/Configuration/WitApplication.cs.meta (100%) rename Scripts/Runtime/{ => Data}/Configuration/WitConfiguration.cs (85%) rename Scripts/Runtime/{ => Data}/Configuration/WitConfiguration.cs.meta (100%) rename Scripts/Runtime/{ => Data}/Configuration/WitConfigurationData.cs (92%) rename Scripts/Runtime/{ => Data}/Configuration/WitConfigurationData.cs.meta (100%) rename Scripts/Runtime/{ => Data}/Configuration/WitRequestOptions.cs (82%) rename Scripts/Runtime/{ => Data}/Configuration/WitRequestOptions.cs.meta (100%) rename Scripts/Runtime/{ => Data}/Configuration/WitRuntimeConfiguration.cs (95%) rename Scripts/Runtime/{ => Data}/Configuration/WitRuntimeConfiguration.cs.meta (100%) create mode 100644 Scripts/Runtime/Data/Entities.meta rename Scripts/Runtime/{Configuration => Data/Entities}/WitDynamicEntities.cs (90%) rename Scripts/Runtime/{Configuration => Data/Entities}/WitDynamicEntities.cs.meta (100%) rename Scripts/Runtime/{Configuration => Data/Entities}/WitDynamicEntity.cs (94%) rename Scripts/Runtime/{Configuration => Data/Entities}/WitDynamicEntity.cs.meta (100%) rename Scripts/Runtime/{Configuration => Data/Entities}/WitEntity.cs (91%) rename Scripts/Runtime/{Configuration => Data/Entities}/WitEntity.cs.meta (100%) rename Scripts/Runtime/{Configuration => Data/Entities}/WitSimpleDynamicEntity.cs (93%) rename Scripts/Runtime/{Configuration => Data/Entities}/WitSimpleDynamicEntity.cs.meta (100%) create mode 100644 Scripts/Runtime/Data/Intents.meta rename Scripts/Runtime/{Configuration => Data/Intents}/WitIntent.cs (91%) rename Scripts/Runtime/{Configuration => Data/Intents}/WitIntent.cs.meta (100%) create mode 100644 Scripts/Runtime/Data/Keywords.meta rename Scripts/Runtime/{Configuration => Data/Keywords}/WitKeyword.cs (91%) rename Scripts/Runtime/{Configuration => Data/Keywords}/WitKeyword.cs.meta (100%) create mode 100644 Scripts/Runtime/Data/Traits.meta rename Scripts/Runtime/{Configuration => Data/Traits}/WitTrait.cs (92%) rename Scripts/Runtime/{Configuration => Data/Traits}/WitTrait.cs.meta (100%) rename Scripts/Runtime/{Configuration => Data/Traits}/WitTraitValue.cs (91%) rename Scripts/Runtime/{Configuration => Data/Traits}/WitTraitValue.cs.meta (100%) diff --git a/Scripts/Editor/BaseWitWindow.cs b/Scripts/Editor/BaseWitWindow.cs index def814b7..34a44bb2 100644 --- a/Scripts/Editor/BaseWitWindow.cs +++ b/Scripts/Editor/BaseWitWindow.cs @@ -5,13 +5,11 @@ * LICENSE file in the root directory of this source tree. */ -using System; -using com.facebook.witai.configuration; -using com.facebook.witai.data; +using Facebook.WitAi.Data.Configuration; using UnityEditor; using UnityEngine; -namespace com.facebook.witai +namespace Facebook.WitAi { public abstract class BaseWitWindow : EditorWindow { diff --git a/Scripts/Editor/CallbackHandlers/SimpleIntentHandlerEditor.cs b/Scripts/Editor/CallbackHandlers/SimpleIntentHandlerEditor.cs index 405f9934..0435c411 100644 --- a/Scripts/Editor/CallbackHandlers/SimpleIntentHandlerEditor.cs +++ b/Scripts/Editor/CallbackHandlers/SimpleIntentHandlerEditor.cs @@ -7,12 +7,11 @@ using System; using System.Linq; -using com.facebook.witai.configuration; +using Facebook.WitAi.Data.Configuration; using UnityEditor; using UnityEngine; - -namespace com.facebook.witai.callbackhandlers +namespace Facebook.WitAi.CallbackHandlers { #if !WIT_DISABLE_UI [CustomEditor(typeof(SimpleIntentHandler))] diff --git a/Scripts/Editor/CallbackHandlers/SimpleStringEntityHandlerEditor.cs b/Scripts/Editor/CallbackHandlers/SimpleStringEntityHandlerEditor.cs index 3f1dd7fc..07e0441d 100644 --- a/Scripts/Editor/CallbackHandlers/SimpleStringEntityHandlerEditor.cs +++ b/Scripts/Editor/CallbackHandlers/SimpleStringEntityHandlerEditor.cs @@ -7,12 +7,12 @@ using System; using System.Linq; -using com.facebook.witai.configuration; +using Facebook.WitAi.Data.Configuration; using UnityEditor; using UnityEngine; -namespace com.facebook.witai.callbackhandlers +namespace Facebook.WitAi.CallbackHandlers { #if !WIT_DISABLE_UI [CustomEditor(typeof(SimpleStringEntityHandler))] diff --git a/Scripts/Editor/CallbackHandlers/ValuePathMatcherPropertyDrawer.cs b/Scripts/Editor/CallbackHandlers/ValuePathMatcherPropertyDrawer.cs index b1c51160..311b561d 100644 --- a/Scripts/Editor/CallbackHandlers/ValuePathMatcherPropertyDrawer.cs +++ b/Scripts/Editor/CallbackHandlers/ValuePathMatcherPropertyDrawer.cs @@ -6,11 +6,11 @@ */ using System.Collections.Generic; -using com.facebook.witai.data; +using Facebook.WitAi.Data; using UnityEditor; using UnityEngine; -namespace com.facebook.witai.callbackhandlers +namespace Facebook.WitAi.CallbackHandlers { #if !WIT_DISABLE_UI [CustomPropertyDrawer(typeof(ValuePathMatcher))] diff --git a/Scripts/Editor/Configuration/WitApplicationDetailProvider.cs b/Scripts/Editor/Configuration/WitApplicationDetailProvider.cs deleted file mode 100644 index 19dfc6e4..00000000 --- a/Scripts/Editor/Configuration/WitApplicationDetailProvider.cs +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the license found in the - * LICENSE file in the root directory of this source tree. - */ -using UnityEditor; -using UnityEngine; -using com.facebook.witai; -using com.facebook.witai.data; -using com.facebook.witai.utility; -using com.facebook.witai.interfaces; - -public class WitApplicationDetailProvider : IApplicationDetailProvider -{ - public void DrawApplication(WitApplication application) - { - if (string.IsNullOrEmpty(application.name)) - { - GUILayout.Label("Loading..."); - } - else - { - InfoField("Name", application.name); - InfoField("ID", application.id); - InfoField("Language", application.lang); - InfoField("Created", application.createdAt); - GUILayout.BeginHorizontal(); - GUILayout.Label("Private", GUILayout.Width(100)); - GUILayout.Toggle(application.isPrivate, ""); - GUILayout.EndHorizontal(); - } - } - - private void InfoField(string name, string value) - { - GUILayout.BeginHorizontal(); - GUILayout.Label(name, GUILayout.Width(100)); - GUILayout.Label(value, "TextField"); - GUILayout.EndHorizontal(); - } -} \ No newline at end of file diff --git a/Scripts/Editor/Configuration.meta b/Scripts/Editor/Data/Configuration.meta similarity index 100% rename from Scripts/Editor/Configuration.meta rename to Scripts/Editor/Data/Configuration.meta diff --git a/Scripts/Editor/Configuration/IApplicationDetailProvider.cs b/Scripts/Editor/Data/Configuration/IApplicationDetailProvider.cs similarity index 81% rename from Scripts/Editor/Configuration/IApplicationDetailProvider.cs rename to Scripts/Editor/Data/Configuration/IApplicationDetailProvider.cs index bed12423..0db9b605 100644 --- a/Scripts/Editor/Configuration/IApplicationDetailProvider.cs +++ b/Scripts/Editor/Data/Configuration/IApplicationDetailProvider.cs @@ -4,9 +4,8 @@ * This source code is licensed under the license found in the * LICENSE file in the root directory of this source tree. */ -using com.facebook.witai.data; -namespace com.facebook.witai.interfaces +namespace Facebook.WitAi.Data.Configuration { public interface IApplicationDetailProvider { diff --git a/Scripts/Editor/Configuration/IApplicationDetailProvider.cs.meta b/Scripts/Editor/Data/Configuration/IApplicationDetailProvider.cs.meta similarity index 100% rename from Scripts/Editor/Configuration/IApplicationDetailProvider.cs.meta rename to Scripts/Editor/Data/Configuration/IApplicationDetailProvider.cs.meta diff --git a/Scripts/Editor/Data/Configuration/WitApplicationDetailProvider.cs b/Scripts/Editor/Data/Configuration/WitApplicationDetailProvider.cs new file mode 100644 index 00000000..023a6050 --- /dev/null +++ b/Scripts/Editor/Data/Configuration/WitApplicationDetailProvider.cs @@ -0,0 +1,42 @@ +/* + * Copyright (c) Facebook, Inc. and its affiliates. + * + * This source code is licensed under the license found in the + * LICENSE file in the root directory of this source tree. + */ + +using UnityEngine; + + +namespace Facebook.WitAi.Data.Configuration +{ + public class WitApplicationDetailProvider : IApplicationDetailProvider + { + public void DrawApplication(WitApplication application) + { + if (string.IsNullOrEmpty(application.name)) + { + GUILayout.Label("Loading..."); + } + else + { + InfoField("Name", application.name); + InfoField("ID", application.id); + InfoField("Language", application.lang); + InfoField("Created", application.createdAt); + GUILayout.BeginHorizontal(); + GUILayout.Label("Private", GUILayout.Width(100)); + GUILayout.Toggle(application.isPrivate, ""); + GUILayout.EndHorizontal(); + } + } + + private void InfoField(string name, string value) + { + GUILayout.BeginHorizontal(); + GUILayout.Label(name, GUILayout.Width(100)); + GUILayout.Label(value, "TextField"); + GUILayout.EndHorizontal(); + } + } +} diff --git a/Scripts/Editor/Configuration/WitApplicationDetailProvider.cs.meta b/Scripts/Editor/Data/Configuration/WitApplicationDetailProvider.cs.meta similarity index 100% rename from Scripts/Editor/Configuration/WitApplicationDetailProvider.cs.meta rename to Scripts/Editor/Data/Configuration/WitApplicationDetailProvider.cs.meta diff --git a/Scripts/Editor/Configuration/WitConfigurationEditor.cs b/Scripts/Editor/Data/Configuration/WitConfigurationEditor.cs similarity index 98% rename from Scripts/Editor/Configuration/WitConfigurationEditor.cs rename to Scripts/Editor/Data/Configuration/WitConfigurationEditor.cs index cc0d04c0..e027416f 100644 --- a/Scripts/Editor/Configuration/WitConfigurationEditor.cs +++ b/Scripts/Editor/Data/Configuration/WitConfigurationEditor.cs @@ -8,15 +8,14 @@ using System; using System.Collections.Generic; using System.Linq; -using com.facebook.witai; -using com.facebook.witai.configuration; -using com.facebook.witai.data; -using com.facebook.witai.utility; -using com.facebook.witai.interfaces; +using Facebook.WitAi.Data.Entities; +using Facebook.WitAi.Data.Intents; +using Facebook.WitAi.Data.Traits; +using Facebook.WitAi.Utilities; using UnityEditor; using UnityEngine; -namespace com.facebook.witai.inspectors +namespace Facebook.WitAi.Data.Configuration { #if !WIT_DISABLE_UI [CustomEditor(typeof(WitConfiguration))] @@ -149,11 +148,11 @@ public override void OnInspectorGUI() { if (configuration.application.id != null && !configuration.application.id.StartsWith("voice")) { - selectedToolPanel = GUILayout.Toolbar(selectedToolPanel, toolPanelNames); + selectedToolPanel = GUILayout.Toolbar(selectedToolPanel, toolPanelNames); } else { - selectedToolPanel = GUILayout.Toolbar(selectedToolPanel, toolPanelNamesOnlyAppInfo); + selectedToolPanel = GUILayout.Toolbar(selectedToolPanel, toolPanelNamesOnlyAppInfo); } } else diff --git a/Scripts/Editor/Configuration/WitConfigurationEditor.cs.meta b/Scripts/Editor/Data/Configuration/WitConfigurationEditor.cs.meta similarity index 100% rename from Scripts/Editor/Configuration/WitConfigurationEditor.cs.meta rename to Scripts/Editor/Data/Configuration/WitConfigurationEditor.cs.meta diff --git a/Scripts/Editor/Configuration/WitConfigurationUtility.cs b/Scripts/Editor/Data/Configuration/WitConfigurationUtility.cs similarity index 97% rename from Scripts/Editor/Configuration/WitConfigurationUtility.cs rename to Scripts/Editor/Data/Configuration/WitConfigurationUtility.cs index 0ea45703..cf9a04a5 100644 --- a/Scripts/Editor/Configuration/WitConfigurationUtility.cs +++ b/Scripts/Editor/Data/Configuration/WitConfigurationUtility.cs @@ -6,12 +6,14 @@ */ using System; -using com.facebook.witai.data; -using com.facebook.witai.lib; -using com.facebook.witai.utility; +using Facebook.WitAi.Data.Entities; +using Facebook.WitAi.Data.Intents; +using Facebook.WitAi.Data.Traits; +using Facebook.WitAi.Lib; +using Facebook.WitAi.Utilities; using UnityEngine; -namespace com.facebook.witai.configuration +namespace Facebook.WitAi.Data.Configuration { public static class WitConfigurationUtility { diff --git a/Scripts/Editor/Configuration/WitConfigurationUtility.cs.meta b/Scripts/Editor/Data/Configuration/WitConfigurationUtility.cs.meta similarity index 100% rename from Scripts/Editor/Configuration/WitConfigurationUtility.cs.meta rename to Scripts/Editor/Data/Configuration/WitConfigurationUtility.cs.meta diff --git a/Scripts/Editor/Configuration/WitWindow.cs b/Scripts/Editor/Data/Configuration/WitWindow.cs similarity index 98% rename from Scripts/Editor/Configuration/WitWindow.cs rename to Scripts/Editor/Data/Configuration/WitWindow.cs index d9b151d9..fa4a6d9f 100644 --- a/Scripts/Editor/Configuration/WitWindow.cs +++ b/Scripts/Editor/Data/Configuration/WitWindow.cs @@ -6,12 +6,10 @@ */ using System; -using com.facebook.witai.inspectors; using UnityEditor; using UnityEngine; -using com.facebook.witai.data; -namespace com.facebook.witai.configuration +namespace Facebook.WitAi.Data.Configuration { public class WitWindow : BaseWitWindow { diff --git a/Scripts/Editor/Configuration/WitWindow.cs.meta b/Scripts/Editor/Data/Configuration/WitWindow.cs.meta similarity index 100% rename from Scripts/Editor/Configuration/WitWindow.cs.meta rename to Scripts/Editor/Data/Configuration/WitWindow.cs.meta diff --git a/Scripts/Editor/Data/WitDataCreation.cs b/Scripts/Editor/Data/WitDataCreation.cs index 7682a53e..ed5dee06 100644 --- a/Scripts/Editor/Data/WitDataCreation.cs +++ b/Scripts/Editor/Data/WitDataCreation.cs @@ -7,12 +7,13 @@ using System.Globalization; using System.Text.RegularExpressions; -using com.facebook.witai.data; -using com.facebook.witai.inspectors; +using Facebook.WitAi.Configuration; +using Facebook.WitAi.Data.Configuration; using UnityEditor; using UnityEngine; -namespace com.facebook.witai.Data + +namespace Facebook.WitAi.Data { public class WitDataCreation { diff --git a/Scripts/Editor/Inspectors/WitInspector.cs b/Scripts/Editor/Inspectors/WitInspector.cs index 1471329a..d7bd89ff 100644 --- a/Scripts/Editor/Inspectors/WitInspector.cs +++ b/Scripts/Editor/Inspectors/WitInspector.cs @@ -8,7 +8,7 @@ using UnityEditor; using UnityEngine; -namespace com.facebook.witai.inspectors +namespace Facebook.WitAi.Inspectors { #if !WIT_DISABLE_UI [CustomEditor(typeof(Wit))] diff --git a/Scripts/Editor/Lib/Mic/MicEditor.cs b/Scripts/Editor/Lib/Mic/MicEditor.cs index 7b70a7fd..4825ec86 100644 --- a/Scripts/Editor/Lib/Mic/MicEditor.cs +++ b/Scripts/Editor/Lib/Mic/MicEditor.cs @@ -7,7 +7,7 @@ using UnityEditor; -namespace com.facebook.witai.lib +namespace Facebook.WitAi.Lib { [CustomEditor(typeof(Mic))] public class MicEditor : Editor diff --git a/Scripts/Editor/Utility/EditorForegroundRunner.cs b/Scripts/Editor/Utility/EditorForegroundRunner.cs index 175e1b48..3a1af6ea 100644 --- a/Scripts/Editor/Utility/EditorForegroundRunner.cs +++ b/Scripts/Editor/Utility/EditorForegroundRunner.cs @@ -9,7 +9,7 @@ using System.Collections.Concurrent; using UnityEditor; -namespace com.facebook.witai.utility +namespace Facebook.WitAi.Utilities { public class EditorForegroundRunner { diff --git a/Scripts/Editor/Utility/WitUnderstandingViewer.cs b/Scripts/Editor/Utility/WitUnderstandingViewer.cs index 68cf303b..61c41b76 100644 --- a/Scripts/Editor/Utility/WitUnderstandingViewer.cs +++ b/Scripts/Editor/Utility/WitUnderstandingViewer.cs @@ -7,13 +7,14 @@ using System; using System.Collections.Generic; -using com.facebook.witai.callbackhandlers; -using com.facebook.witai.Data; -using com.facebook.witai.lib; +using Facebook.WitAi.CallbackHandlers; +using Facebook.WitAi.Configuration; +using Facebook.WitAi.Data; +using Facebook.WitAi.Lib; using UnityEditor; using UnityEngine; -namespace com.facebook.witai.utility +namespace Facebook.WitAi.Utilities { public class WitUnderstandingViewer : BaseWitWindow { diff --git a/Scripts/Editor/WitEditorUI.cs b/Scripts/Editor/WitEditorUI.cs index f6897daa..c0f2a888 100644 --- a/Scripts/Editor/WitEditorUI.cs +++ b/Scripts/Editor/WitEditorUI.cs @@ -7,7 +7,7 @@ using UnityEditor; -namespace com.facebook.witai +namespace Facebook.WitAi { public class WitEditorUI { diff --git a/Scripts/Editor/WitStyles.cs b/Scripts/Editor/WitStyles.cs index 2411143c..d3c1c88b 100644 --- a/Scripts/Editor/WitStyles.cs +++ b/Scripts/Editor/WitStyles.cs @@ -8,7 +8,7 @@ using UnityEditor; using UnityEngine; -namespace com.facebook.witai +namespace Facebook.WitAi { public class WitStyles { diff --git a/Scripts/Runtime/CallbackHandlers/SimpleIntentHandler.cs b/Scripts/Runtime/CallbackHandlers/SimpleIntentHandler.cs index 15d8dd80..013874db 100644 --- a/Scripts/Runtime/CallbackHandlers/SimpleIntentHandler.cs +++ b/Scripts/Runtime/CallbackHandlers/SimpleIntentHandler.cs @@ -5,11 +5,11 @@ * LICENSE file in the root directory of this source tree. */ -using com.facebook.witai.lib; +using Facebook.WitAi.Lib; using UnityEngine; using UnityEngine.Events; -namespace com.facebook.witai.callbackhandlers +namespace Facebook.WitAi.CallbackHandlers { public class SimpleIntentHandler : WitResponseHandler { diff --git a/Scripts/Runtime/CallbackHandlers/SimpleStringEntityHandler.cs b/Scripts/Runtime/CallbackHandlers/SimpleStringEntityHandler.cs index 2143f82d..17756a2e 100644 --- a/Scripts/Runtime/CallbackHandlers/SimpleStringEntityHandler.cs +++ b/Scripts/Runtime/CallbackHandlers/SimpleStringEntityHandler.cs @@ -6,11 +6,11 @@ */ using System; -using com.facebook.witai.lib; +using Facebook.WitAi.Lib; using UnityEngine; using UnityEngine.Events; -namespace com.facebook.witai.callbackhandlers +namespace Facebook.WitAi.CallbackHandlers { public class SimpleStringEntityHandler : WitResponseHandler { diff --git a/Scripts/Runtime/CallbackHandlers/WitResponseHandler.cs b/Scripts/Runtime/CallbackHandlers/WitResponseHandler.cs index 3c3acee8..ef952e92 100644 --- a/Scripts/Runtime/CallbackHandlers/WitResponseHandler.cs +++ b/Scripts/Runtime/CallbackHandlers/WitResponseHandler.cs @@ -5,10 +5,10 @@ * LICENSE file in the root directory of this source tree. */ -using com.facebook.witai.lib; +using Facebook.WitAi.Lib; using UnityEngine; -namespace com.facebook.witai.callbackhandlers +namespace Facebook.WitAi.CallbackHandlers { public abstract class WitResponseHandler : MonoBehaviour { diff --git a/Scripts/Runtime/CallbackHandlers/WitResponseMatcher.cs b/Scripts/Runtime/CallbackHandlers/WitResponseMatcher.cs index bdbc10cb..e4038dea 100644 --- a/Scripts/Runtime/CallbackHandlers/WitResponseMatcher.cs +++ b/Scripts/Runtime/CallbackHandlers/WitResponseMatcher.cs @@ -8,13 +8,13 @@ using System; using System.Collections.Generic; using System.Text.RegularExpressions; -using com.facebook.witai.data; -using com.facebook.witai.lib; +using Facebook.WitAi.Data; +using Facebook.WitAi.Lib; using UnityEngine; using UnityEngine.Events; using UnityEngine.Serialization; -namespace com.facebook.witai.callbackhandlers +namespace Facebook.WitAi.CallbackHandlers { public class WitResponseMatcher : WitResponseHandler { diff --git a/Scripts/Runtime/CallbackHandlers/WitUtteranceMatcher.cs b/Scripts/Runtime/CallbackHandlers/WitUtteranceMatcher.cs index 1fe864f6..279692d4 100644 --- a/Scripts/Runtime/CallbackHandlers/WitUtteranceMatcher.cs +++ b/Scripts/Runtime/CallbackHandlers/WitUtteranceMatcher.cs @@ -6,12 +6,11 @@ */ using System.Text.RegularExpressions; -using com.facebook.witai.callbackhandlers; -using com.facebook.witai.lib; -using com.facebook.witai.utilities; +using Facebook.WitAi.Lib; +using Facebook.WitAi.Utilities; using UnityEngine; -namespace com.facebook.witai.callbackhandlers +namespace Facebook.WitAi.CallbackHandlers { public class WitUtteranceMatcher : WitResponseHandler { diff --git a/Scripts/Runtime/Data/AudioEncoding.cs b/Scripts/Runtime/Data/AudioEncoding.cs index 18853e20..28268385 100644 --- a/Scripts/Runtime/Data/AudioEncoding.cs +++ b/Scripts/Runtime/Data/AudioEncoding.cs @@ -7,7 +7,7 @@ using System; -namespace com.facebook.witai.data +namespace Facebook.WitAi.Data { [Serializable] public class AudioEncoding diff --git a/Scripts/Runtime/Configuration.meta b/Scripts/Runtime/Data/Configuration.meta similarity index 100% rename from Scripts/Runtime/Configuration.meta rename to Scripts/Runtime/Data/Configuration.meta diff --git a/Scripts/Runtime/Configuration/WitApplication.cs b/Scripts/Runtime/Data/Configuration/WitApplication.cs similarity index 92% rename from Scripts/Runtime/Configuration/WitApplication.cs rename to Scripts/Runtime/Data/Configuration/WitApplication.cs index ef48b3fe..4897f708 100644 --- a/Scripts/Runtime/Configuration/WitApplication.cs +++ b/Scripts/Runtime/Data/Configuration/WitApplication.cs @@ -6,10 +6,11 @@ */ using System; -using com.facebook.witai.lib; +using Facebook.WitAi.Configuration; +using Facebook.WitAi.Lib; using UnityEngine; -namespace com.facebook.witai.data +namespace Facebook.WitAi.Data.Configuration { [Serializable] diff --git a/Scripts/Runtime/Configuration/WitApplication.cs.meta b/Scripts/Runtime/Data/Configuration/WitApplication.cs.meta similarity index 100% rename from Scripts/Runtime/Configuration/WitApplication.cs.meta rename to Scripts/Runtime/Data/Configuration/WitApplication.cs.meta diff --git a/Scripts/Runtime/Configuration/WitConfiguration.cs b/Scripts/Runtime/Data/Configuration/WitConfiguration.cs similarity index 85% rename from Scripts/Runtime/Configuration/WitConfiguration.cs rename to Scripts/Runtime/Data/Configuration/WitConfiguration.cs index be46e5b6..87cf7e1d 100644 --- a/Scripts/Runtime/Configuration/WitConfiguration.cs +++ b/Scripts/Runtime/Data/Configuration/WitConfiguration.cs @@ -5,16 +5,17 @@ * LICENSE file in the root directory of this source tree. */ -using System; using System.ComponentModel; -using com.facebook.witai.lib; +using Facebook.WitAi.Data.Entities; +using Facebook.WitAi.Data.Intents; +using Facebook.WitAi.Data.Traits; using UnityEngine; #if UNITY_EDITOR using UnityEditor; #endif -namespace com.facebook.witai.data +namespace Facebook.WitAi.Data.Configuration { #if !WIT_DISABLE_UI [CreateAssetMenu(fileName = "WitConfiguration", menuName = "Wit/Configuration", order = 1)] diff --git a/Scripts/Runtime/Configuration/WitConfiguration.cs.meta b/Scripts/Runtime/Data/Configuration/WitConfiguration.cs.meta similarity index 100% rename from Scripts/Runtime/Configuration/WitConfiguration.cs.meta rename to Scripts/Runtime/Data/Configuration/WitConfiguration.cs.meta diff --git a/Scripts/Runtime/Configuration/WitConfigurationData.cs b/Scripts/Runtime/Data/Configuration/WitConfigurationData.cs similarity index 92% rename from Scripts/Runtime/Configuration/WitConfigurationData.cs rename to Scripts/Runtime/Data/Configuration/WitConfigurationData.cs index a70f8968..c8643869 100644 --- a/Scripts/Runtime/Configuration/WitConfigurationData.cs +++ b/Scripts/Runtime/Data/Configuration/WitConfigurationData.cs @@ -6,10 +6,11 @@ */ using System; -using com.facebook.witai.lib; +using Facebook.WitAi.Data.Configuration; +using Facebook.WitAi.Lib; using UnityEngine; -namespace com.facebook.witai.data +namespace Facebook.WitAi.Configuration { [Serializable] public abstract class WitConfigurationData diff --git a/Scripts/Runtime/Configuration/WitConfigurationData.cs.meta b/Scripts/Runtime/Data/Configuration/WitConfigurationData.cs.meta similarity index 100% rename from Scripts/Runtime/Configuration/WitConfigurationData.cs.meta rename to Scripts/Runtime/Data/Configuration/WitConfigurationData.cs.meta diff --git a/Scripts/Runtime/Configuration/WitRequestOptions.cs b/Scripts/Runtime/Data/Configuration/WitRequestOptions.cs similarity index 82% rename from Scripts/Runtime/Configuration/WitRequestOptions.cs rename to Scripts/Runtime/Data/Configuration/WitRequestOptions.cs index 77f82b60..53c9a90e 100644 --- a/Scripts/Runtime/Configuration/WitRequestOptions.cs +++ b/Scripts/Runtime/Data/Configuration/WitRequestOptions.cs @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -using com.facebook.witai.interfaces; +using Facebook.WitAi.Interfaces; -namespace com.facebook.witai +namespace Facebook.WitAi.Configuration { public class WitRequestOptions { diff --git a/Scripts/Runtime/Configuration/WitRequestOptions.cs.meta b/Scripts/Runtime/Data/Configuration/WitRequestOptions.cs.meta similarity index 100% rename from Scripts/Runtime/Configuration/WitRequestOptions.cs.meta rename to Scripts/Runtime/Data/Configuration/WitRequestOptions.cs.meta diff --git a/Scripts/Runtime/Configuration/WitRuntimeConfiguration.cs b/Scripts/Runtime/Data/Configuration/WitRuntimeConfiguration.cs similarity index 95% rename from Scripts/Runtime/Configuration/WitRuntimeConfiguration.cs rename to Scripts/Runtime/Data/Configuration/WitRuntimeConfiguration.cs index d0c39ade..d4e41b63 100644 --- a/Scripts/Runtime/Configuration/WitRuntimeConfiguration.cs +++ b/Scripts/Runtime/Data/Configuration/WitRuntimeConfiguration.cs @@ -6,11 +6,12 @@ */ using System; -using com.facebook.witai.interfaces; +using Facebook.WitAi.Data.Configuration; +using Facebook.WitAi.Interfaces; using UnityEngine; using UnityEngine.Serialization; -namespace com.facebook.witai.data +namespace Facebook.WitAi.Configuration { [Serializable] public class WitRuntimeConfiguration diff --git a/Scripts/Runtime/Configuration/WitRuntimeConfiguration.cs.meta b/Scripts/Runtime/Data/Configuration/WitRuntimeConfiguration.cs.meta similarity index 100% rename from Scripts/Runtime/Configuration/WitRuntimeConfiguration.cs.meta rename to Scripts/Runtime/Data/Configuration/WitRuntimeConfiguration.cs.meta diff --git a/Scripts/Runtime/Data/Entities.meta b/Scripts/Runtime/Data/Entities.meta new file mode 100644 index 00000000..7b0b7cf2 --- /dev/null +++ b/Scripts/Runtime/Data/Entities.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d92a289db3a8408dba9dd973090b1ade +timeCreated: 1632287743 \ No newline at end of file diff --git a/Scripts/Runtime/Configuration/WitDynamicEntities.cs b/Scripts/Runtime/Data/Entities/WitDynamicEntities.cs similarity index 90% rename from Scripts/Runtime/Configuration/WitDynamicEntities.cs rename to Scripts/Runtime/Data/Entities/WitDynamicEntities.cs index 91fad086..beacf6ec 100644 --- a/Scripts/Runtime/Configuration/WitDynamicEntities.cs +++ b/Scripts/Runtime/Data/Entities/WitDynamicEntities.cs @@ -6,10 +6,10 @@ */ using System.Collections.Generic; -using com.facebook.witai.interfaces; -using com.facebook.witai.lib; +using Facebook.WitAi.Interfaces; +using Facebook.WitAi.Lib; -namespace com.facebook.witai +namespace Facebook.WitAi.Data.Entities { public class WitDynamicEntities : IDynamicEntitiesProvider { diff --git a/Scripts/Runtime/Configuration/WitDynamicEntities.cs.meta b/Scripts/Runtime/Data/Entities/WitDynamicEntities.cs.meta similarity index 100% rename from Scripts/Runtime/Configuration/WitDynamicEntities.cs.meta rename to Scripts/Runtime/Data/Entities/WitDynamicEntities.cs.meta diff --git a/Scripts/Runtime/Configuration/WitDynamicEntity.cs b/Scripts/Runtime/Data/Entities/WitDynamicEntity.cs similarity index 94% rename from Scripts/Runtime/Configuration/WitDynamicEntity.cs rename to Scripts/Runtime/Data/Entities/WitDynamicEntity.cs index 5ba71532..f449b6d4 100644 --- a/Scripts/Runtime/Configuration/WitDynamicEntity.cs +++ b/Scripts/Runtime/Data/Entities/WitDynamicEntity.cs @@ -6,10 +6,10 @@ */ using System.Collections.Generic; -using com.facebook.witai.interfaces; -using com.facebook.witai.lib; +using Facebook.WitAi.Interfaces; +using Facebook.WitAi.Lib; -namespace com.facebook.witai +namespace Facebook.WitAi.Data.Entities { public class WitDynamicEntity : IDynamicEntitiesProvider { diff --git a/Scripts/Runtime/Configuration/WitDynamicEntity.cs.meta b/Scripts/Runtime/Data/Entities/WitDynamicEntity.cs.meta similarity index 100% rename from Scripts/Runtime/Configuration/WitDynamicEntity.cs.meta rename to Scripts/Runtime/Data/Entities/WitDynamicEntity.cs.meta diff --git a/Scripts/Runtime/Configuration/WitEntity.cs b/Scripts/Runtime/Data/Entities/WitEntity.cs similarity index 91% rename from Scripts/Runtime/Configuration/WitEntity.cs rename to Scripts/Runtime/Data/Entities/WitEntity.cs index 67c6d190..9166ba66 100644 --- a/Scripts/Runtime/Configuration/WitEntity.cs +++ b/Scripts/Runtime/Data/Entities/WitEntity.cs @@ -6,10 +6,12 @@ */ using System; -using com.facebook.witai.lib; +using Facebook.WitAi.Configuration; +using Facebook.WitAi.Data.Keywords; +using Facebook.WitAi.Lib; using UnityEngine; -namespace com.facebook.witai.data +namespace Facebook.WitAi.Data.Entities { [Serializable] diff --git a/Scripts/Runtime/Configuration/WitEntity.cs.meta b/Scripts/Runtime/Data/Entities/WitEntity.cs.meta similarity index 100% rename from Scripts/Runtime/Configuration/WitEntity.cs.meta rename to Scripts/Runtime/Data/Entities/WitEntity.cs.meta diff --git a/Scripts/Runtime/Configuration/WitSimpleDynamicEntity.cs b/Scripts/Runtime/Data/Entities/WitSimpleDynamicEntity.cs similarity index 93% rename from Scripts/Runtime/Configuration/WitSimpleDynamicEntity.cs rename to Scripts/Runtime/Data/Entities/WitSimpleDynamicEntity.cs index a39385ef..b3de5dfc 100644 --- a/Scripts/Runtime/Configuration/WitSimpleDynamicEntity.cs +++ b/Scripts/Runtime/Data/Entities/WitSimpleDynamicEntity.cs @@ -6,10 +6,10 @@ */ using System.Collections.Generic; -using com.facebook.witai.interfaces; -using com.facebook.witai.lib; +using Facebook.WitAi.Interfaces; +using Facebook.WitAi.Lib; -namespace com.facebook.witai +namespace Facebook.WitAi.Data.Entities { public class WitSimpleDynamicEntity : IDynamicEntitiesProvider { diff --git a/Scripts/Runtime/Configuration/WitSimpleDynamicEntity.cs.meta b/Scripts/Runtime/Data/Entities/WitSimpleDynamicEntity.cs.meta similarity index 100% rename from Scripts/Runtime/Configuration/WitSimpleDynamicEntity.cs.meta rename to Scripts/Runtime/Data/Entities/WitSimpleDynamicEntity.cs.meta diff --git a/Scripts/Runtime/Data/Intents.meta b/Scripts/Runtime/Data/Intents.meta new file mode 100644 index 00000000..4dd4257d --- /dev/null +++ b/Scripts/Runtime/Data/Intents.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7de07ce5d8884e15924606bffef7ed67 +timeCreated: 1632287863 \ No newline at end of file diff --git a/Scripts/Runtime/Configuration/WitIntent.cs b/Scripts/Runtime/Data/Intents/WitIntent.cs similarity index 91% rename from Scripts/Runtime/Configuration/WitIntent.cs rename to Scripts/Runtime/Data/Intents/WitIntent.cs index 1dd01f0b..4db8b6a4 100644 --- a/Scripts/Runtime/Configuration/WitIntent.cs +++ b/Scripts/Runtime/Data/Intents/WitIntent.cs @@ -6,10 +6,12 @@ */ using System; -using com.facebook.witai.lib; +using Facebook.WitAi.Configuration; +using Facebook.WitAi.Data.Entities; +using Facebook.WitAi.Lib; using UnityEngine; -namespace com.facebook.witai.data +namespace Facebook.WitAi.Data.Intents { [Serializable] diff --git a/Scripts/Runtime/Configuration/WitIntent.cs.meta b/Scripts/Runtime/Data/Intents/WitIntent.cs.meta similarity index 100% rename from Scripts/Runtime/Configuration/WitIntent.cs.meta rename to Scripts/Runtime/Data/Intents/WitIntent.cs.meta diff --git a/Scripts/Runtime/Data/Keywords.meta b/Scripts/Runtime/Data/Keywords.meta new file mode 100644 index 00000000..9498e4f5 --- /dev/null +++ b/Scripts/Runtime/Data/Keywords.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 90f74c8768a041f1803383e7c62e89e0 +timeCreated: 1632287849 \ No newline at end of file diff --git a/Scripts/Runtime/Configuration/WitKeyword.cs b/Scripts/Runtime/Data/Keywords/WitKeyword.cs similarity index 91% rename from Scripts/Runtime/Configuration/WitKeyword.cs rename to Scripts/Runtime/Data/Keywords/WitKeyword.cs index c7657899..d9612c5e 100644 --- a/Scripts/Runtime/Configuration/WitKeyword.cs +++ b/Scripts/Runtime/Data/Keywords/WitKeyword.cs @@ -6,10 +6,10 @@ */ using System; -using com.facebook.witai.lib; +using Facebook.WitAi.Lib; using UnityEngine; -namespace com.facebook.witai.data +namespace Facebook.WitAi.Data.Keywords { [Serializable] public class WitKeyword diff --git a/Scripts/Runtime/Configuration/WitKeyword.cs.meta b/Scripts/Runtime/Data/Keywords/WitKeyword.cs.meta similarity index 100% rename from Scripts/Runtime/Configuration/WitKeyword.cs.meta rename to Scripts/Runtime/Data/Keywords/WitKeyword.cs.meta diff --git a/Scripts/Runtime/Data/RingBuffer.cs b/Scripts/Runtime/Data/RingBuffer.cs index ae0b3594..c6b506fb 100644 --- a/Scripts/Runtime/Data/RingBuffer.cs +++ b/Scripts/Runtime/Data/RingBuffer.cs @@ -8,7 +8,7 @@ using System; using UnityEngine; -namespace com.facebook.witai.data +namespace Facebook.WitAi.Data { public class RingBuffer { diff --git a/Scripts/Runtime/Data/Traits.meta b/Scripts/Runtime/Data/Traits.meta new file mode 100644 index 00000000..97b68cdf --- /dev/null +++ b/Scripts/Runtime/Data/Traits.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 982d60138e5147b88a5117adc9ded942 +timeCreated: 1632287691 \ No newline at end of file diff --git a/Scripts/Runtime/Configuration/WitTrait.cs b/Scripts/Runtime/Data/Traits/WitTrait.cs similarity index 92% rename from Scripts/Runtime/Configuration/WitTrait.cs rename to Scripts/Runtime/Data/Traits/WitTrait.cs index af7505c3..89d3a691 100644 --- a/Scripts/Runtime/Configuration/WitTrait.cs +++ b/Scripts/Runtime/Data/Traits/WitTrait.cs @@ -6,10 +6,11 @@ */ using System; -using com.facebook.witai.lib; +using Facebook.WitAi.Configuration; +using Facebook.WitAi.Lib; using UnityEngine; -namespace com.facebook.witai.data +namespace Facebook.WitAi.Data.Traits { [Serializable] public class WitTrait : WitConfigurationData diff --git a/Scripts/Runtime/Configuration/WitTrait.cs.meta b/Scripts/Runtime/Data/Traits/WitTrait.cs.meta similarity index 100% rename from Scripts/Runtime/Configuration/WitTrait.cs.meta rename to Scripts/Runtime/Data/Traits/WitTrait.cs.meta diff --git a/Scripts/Runtime/Configuration/WitTraitValue.cs b/Scripts/Runtime/Data/Traits/WitTraitValue.cs similarity index 91% rename from Scripts/Runtime/Configuration/WitTraitValue.cs rename to Scripts/Runtime/Data/Traits/WitTraitValue.cs index f4543cde..f646f989 100644 --- a/Scripts/Runtime/Configuration/WitTraitValue.cs +++ b/Scripts/Runtime/Data/Traits/WitTraitValue.cs @@ -6,10 +6,10 @@ */ using System; -using com.facebook.witai.lib; +using Facebook.WitAi.Lib; using UnityEngine; -namespace com.facebook.witai.data +namespace Facebook.WitAi.Data.Traits { [Serializable] public class WitTraitValue diff --git a/Scripts/Runtime/Configuration/WitTraitValue.cs.meta b/Scripts/Runtime/Data/Traits/WitTraitValue.cs.meta similarity index 100% rename from Scripts/Runtime/Configuration/WitTraitValue.cs.meta rename to Scripts/Runtime/Data/Traits/WitTraitValue.cs.meta diff --git a/Scripts/Runtime/Data/WitFloatValue.cs b/Scripts/Runtime/Data/WitFloatValue.cs index e8de6605..93f98283 100644 --- a/Scripts/Runtime/Data/WitFloatValue.cs +++ b/Scripts/Runtime/Data/WitFloatValue.cs @@ -6,10 +6,10 @@ */ using System; -using com.facebook.witai.lib; +using Facebook.WitAi.Lib; using UnityEngine; -namespace com.facebook.witai.data +namespace Facebook.WitAi.Data { public class WitFloatValue : WitValue { diff --git a/Scripts/Runtime/Data/WitIntValue.cs b/Scripts/Runtime/Data/WitIntValue.cs index fdd7d602..12484bdb 100644 --- a/Scripts/Runtime/Data/WitIntValue.cs +++ b/Scripts/Runtime/Data/WitIntValue.cs @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -using com.facebook.witai.lib; +using Facebook.WitAi.Lib; -namespace com.facebook.witai.data +namespace Facebook.WitAi.Data { public class WitIntValue : WitValue { diff --git a/Scripts/Runtime/Data/WitStringValue.cs b/Scripts/Runtime/Data/WitStringValue.cs index d234c532..dabbf014 100644 --- a/Scripts/Runtime/Data/WitStringValue.cs +++ b/Scripts/Runtime/Data/WitStringValue.cs @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -using com.facebook.witai.lib; +using Facebook.WitAi.Lib; -namespace com.facebook.witai.data +namespace Facebook.WitAi.Data { public class WitStringValue : WitValue { diff --git a/Scripts/Runtime/Data/WitValue.cs b/Scripts/Runtime/Data/WitValue.cs index 2aa3463c..c7a3dfac 100644 --- a/Scripts/Runtime/Data/WitValue.cs +++ b/Scripts/Runtime/Data/WitValue.cs @@ -5,10 +5,10 @@ * LICENSE file in the root directory of this source tree. */ -using com.facebook.witai.lib; +using Facebook.WitAi.Lib; using UnityEngine; -namespace com.facebook.witai.data +namespace Facebook.WitAi.Data { public abstract class WitValue : ScriptableObject { diff --git a/Scripts/Runtime/Events/VoiceEvents.cs b/Scripts/Runtime/Events/VoiceEvents.cs index cd23cb2f..af9d9da5 100644 --- a/Scripts/Runtime/Events/VoiceEvents.cs +++ b/Scripts/Runtime/Events/VoiceEvents.cs @@ -9,7 +9,7 @@ using UnityEngine; using UnityEngine.Events; -namespace com.facebook.witai.events +namespace Facebook.WitAi.Events { [Serializable] public class VoiceEvents diff --git a/Scripts/Runtime/Events/WitErrorEvent.cs b/Scripts/Runtime/Events/WitErrorEvent.cs index 3231a904..bba16546 100644 --- a/Scripts/Runtime/Events/WitErrorEvent.cs +++ b/Scripts/Runtime/Events/WitErrorEvent.cs @@ -8,7 +8,7 @@ using System; using UnityEngine.Events; -namespace com.facebook.witai.events +namespace Facebook.WitAi.Events { [Serializable] public class WitErrorEvent : UnityEvent diff --git a/Scripts/Runtime/Events/WitMicLevelChangedEvent.cs b/Scripts/Runtime/Events/WitMicLevelChangedEvent.cs index a2d4c086..d0421456 100644 --- a/Scripts/Runtime/Events/WitMicLevelChangedEvent.cs +++ b/Scripts/Runtime/Events/WitMicLevelChangedEvent.cs @@ -8,7 +8,7 @@ using System; using UnityEngine.Events; -namespace com.facebook.witai.events +namespace Facebook.WitAi.Events { [Serializable] public class WitMicLevelChangedEvent : UnityEvent diff --git a/Scripts/Runtime/Events/WitRequestCreatedEvent.cs b/Scripts/Runtime/Events/WitRequestCreatedEvent.cs index 62c9172a..c2b41e66 100644 --- a/Scripts/Runtime/Events/WitRequestCreatedEvent.cs +++ b/Scripts/Runtime/Events/WitRequestCreatedEvent.cs @@ -8,7 +8,7 @@ using System; using UnityEngine.Events; -namespace com.facebook.witai.events +namespace Facebook.WitAi.Events { [Serializable] public class WitRequestCreatedEvent : UnityEvent diff --git a/Scripts/Runtime/Events/WitResponseEvent.cs b/Scripts/Runtime/Events/WitResponseEvent.cs index 759c6775..24056b17 100644 --- a/Scripts/Runtime/Events/WitResponseEvent.cs +++ b/Scripts/Runtime/Events/WitResponseEvent.cs @@ -6,10 +6,10 @@ */ using System; -using com.facebook.witai.lib; +using Facebook.WitAi.Lib; using UnityEngine.Events; -namespace com.facebook.witai.events +namespace Facebook.WitAi.Events { [Serializable] public class WitResponseEvent : UnityEvent diff --git a/Scripts/Runtime/Events/WitTranscriptionEvent.cs b/Scripts/Runtime/Events/WitTranscriptionEvent.cs index e0f87f9b..8fd48223 100644 --- a/Scripts/Runtime/Events/WitTranscriptionEvent.cs +++ b/Scripts/Runtime/Events/WitTranscriptionEvent.cs @@ -8,7 +8,7 @@ using System; using UnityEngine.Events; -namespace com.facebook.witai.events +namespace Facebook.WitAi.Events { [Serializable] public class WitTranscriptionEvent : UnityEvent { } diff --git a/Scripts/Runtime/Interfaces/CustomTranscriptionProvider.cs b/Scripts/Runtime/Interfaces/CustomTranscriptionProvider.cs index f3ea5d7d..8ec5c495 100644 --- a/Scripts/Runtime/Interfaces/CustomTranscriptionProvider.cs +++ b/Scripts/Runtime/Interfaces/CustomTranscriptionProvider.cs @@ -5,11 +5,11 @@ * LICENSE file in the root directory of this source tree. */ -using com.facebook.witai.events; +using Facebook.WitAi.Events; using UnityEngine; using UnityEngine.Events; -namespace com.facebook.witai.interfaces +namespace Facebook.WitAi.Interfaces { public abstract class CustomTranscriptionProvider : MonoBehaviour, ITranscriptionProvider { diff --git a/Scripts/Runtime/Interfaces/IAudioInputSource.cs b/Scripts/Runtime/Interfaces/IAudioInputSource.cs index 67bee23f..43068423 100644 --- a/Scripts/Runtime/Interfaces/IAudioInputSource.cs +++ b/Scripts/Runtime/Interfaces/IAudioInputSource.cs @@ -6,9 +6,9 @@ */ using System; -using com.facebook.witai.data; +using Facebook.WitAi.Data; -namespace com.facebook.witai.interfaces +namespace Facebook.WitAi.Interfaces { public interface IAudioInputSource { diff --git a/Scripts/Runtime/Interfaces/IDynamicEntitiesProvider.cs b/Scripts/Runtime/Interfaces/IDynamicEntitiesProvider.cs index 10a398f7..8669c255 100644 --- a/Scripts/Runtime/Interfaces/IDynamicEntitiesProvider.cs +++ b/Scripts/Runtime/Interfaces/IDynamicEntitiesProvider.cs @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -namespace com.facebook.witai.interfaces +namespace Facebook.WitAi.Interfaces { public interface IDynamicEntitiesProvider { diff --git a/Scripts/Runtime/Interfaces/ITranscriptionProvider.cs b/Scripts/Runtime/Interfaces/ITranscriptionProvider.cs index 81cf2082..9bf8d795 100644 --- a/Scripts/Runtime/Interfaces/ITranscriptionProvider.cs +++ b/Scripts/Runtime/Interfaces/ITranscriptionProvider.cs @@ -5,10 +5,10 @@ * LICENSE file in the root directory of this source tree. */ -using com.facebook.witai.events; +using Facebook.WitAi.Events; using UnityEngine.Events; -namespace com.facebook.witai.interfaces +namespace Facebook.WitAi.Interfaces { public interface ITranscriptionProvider { diff --git a/Scripts/Runtime/Lib/Mic.cs b/Scripts/Runtime/Lib/Mic.cs index 448c90a8..1023b2ad 100644 --- a/Scripts/Runtime/Lib/Mic.cs +++ b/Scripts/Runtime/Lib/Mic.cs @@ -23,10 +23,10 @@ using UnityEngine; using System.Collections; using System.Collections.Generic; -using com.facebook.witai.data; -using com.facebook.witai.interfaces; +using Facebook.WitAi.Data; +using Facebook.WitAi.Interfaces; -namespace com.facebook.witai.lib +namespace Facebook.WitAi.Lib { [RequireComponent(typeof(AudioSource))] public class Mic : MonoBehaviour, IAudioInputSource diff --git a/Scripts/Runtime/Lib/WitResponse.cs b/Scripts/Runtime/Lib/WitResponse.cs index 65406881..326e84c8 100644 --- a/Scripts/Runtime/Lib/WitResponse.cs +++ b/Scripts/Runtime/Lib/WitResponse.cs @@ -48,13 +48,14 @@ * 2021-26-5 Update: * Renamed to avoid name collisions with other libraries that include a copy of SimpleJSON * * * * */ + using System; using System.Collections; using System.Collections.Generic; using System.Linq; -namespace com.facebook.witai.lib +namespace Facebook.WitAi.Lib { public enum JSONBinaryTag { diff --git a/Scripts/Runtime/Utilities/FloatToStringEvent.cs b/Scripts/Runtime/Utilities/FloatToStringEvent.cs index 20208d23..e5e16139 100644 --- a/Scripts/Runtime/Utilities/FloatToStringEvent.cs +++ b/Scripts/Runtime/Utilities/FloatToStringEvent.cs @@ -9,7 +9,7 @@ using UnityEngine; using UnityEngine.Events; -namespace com.facebook.witai.utilities +namespace Facebook.WitAi.Utilities { public class FloatToStringEvent : MonoBehaviour { diff --git a/Scripts/Runtime/VoiceService.cs b/Scripts/Runtime/VoiceService.cs index 9c8a76e4..7c5b8762 100644 --- a/Scripts/Runtime/VoiceService.cs +++ b/Scripts/Runtime/VoiceService.cs @@ -1,8 +1,16 @@ -using com.facebook.witai.events; -using com.facebook.witai.interfaces; +/* + * Copyright (c) Facebook, Inc. and its affiliates. + * + * This source code is licensed under the license found in the + * LICENSE file in the root directory of this source tree. + */ + +using Facebook.WitAi.Configuration; +using Facebook.WitAi.Events; +using Facebook.WitAi.Interfaces; using UnityEngine; -namespace com.facebook.witai +namespace Facebook.WitAi { public abstract class VoiceService : MonoBehaviour, IVoiceService { diff --git a/Scripts/Runtime/Wit.cs b/Scripts/Runtime/Wit.cs index b6a0834a..89bdf781 100644 --- a/Scripts/Runtime/Wit.cs +++ b/Scripts/Runtime/Wit.cs @@ -10,12 +10,13 @@ using System.Collections; using System.Collections.Concurrent; using System.Net; -using com.facebook.witai.data; -using com.facebook.witai.interfaces; -using com.facebook.witai.lib; +using Facebook.WitAi.Configuration; +using Facebook.WitAi.Data; +using Facebook.WitAi.Interfaces; +using Facebook.WitAi.Lib; using UnityEngine.Serialization; -namespace com.facebook.witai +namespace Facebook.WitAi { public class Wit : VoiceService, IWitRuntimeConfigProvider { diff --git a/Scripts/Runtime/WitAuthUtility.cs b/Scripts/Runtime/WitAuthUtility.cs index dd613572..a4663819 100644 --- a/Scripts/Runtime/WitAuthUtility.cs +++ b/Scripts/Runtime/WitAuthUtility.cs @@ -6,122 +6,126 @@ */ using System; -using com.facebook.witai.data; -#if UNITY_EDITOR -using UnityEditor; +using Facebook.WitAi.Data.Configuration; using UnityEngine; +#if UNITY_EDITOR +using UnityEditor; #endif -public class WitAuthUtility +namespace Facebook.WitAi { - public static ITokenValidationProvider tokenValidator = new DefaultTokenValidatorProvider(); - - public static bool IsServerTokenValid() + public class WitAuthUtility { - return tokenValidator.IsServerTokenValid(ServerToken); - } + public static ITokenValidationProvider tokenValidator = new DefaultTokenValidatorProvider(); - public static bool IsServerTokenValid(string token) - { - return tokenValidator.IsServerTokenValid(token); - } + public static bool IsServerTokenValid() + { + return tokenValidator.IsServerTokenValid(ServerToken); + } - private static string serverToken; + public static bool IsServerTokenValid(string token) + { + return tokenValidator.IsServerTokenValid(token); + } - public static string GetAppServerToken(WitConfiguration configuration, string defaultValue = "") - { - return GetAppServerToken(configuration?.application?.id, defaultValue); - } + private static string serverToken; - public static string GetAppServerToken(string appId, string defaultValue = "") - { + public static string GetAppServerToken(WitConfiguration configuration, + string defaultValue = "") + { + return GetAppServerToken(configuration?.application?.id, defaultValue); + } + + public static string GetAppServerToken(string appId, string defaultValue = "") + { #if UNITY_EDITOR - return EditorPrefs.GetString("Wit::AppIdToToken::" + appId, defaultValue); + return EditorPrefs.GetString("Wit::AppIdToToken::" + appId, defaultValue); #else return ""; #endif - } + } - public static string GetAppId(string serverToken, string defaultValue = "") - { + public static string GetAppId(string serverToken, string defaultValue = "") + { #if UNITY_EDITOR - return EditorPrefs.GetString("Wit::TokenToAppId::" + serverToken, defaultValue); + return EditorPrefs.GetString("Wit::TokenToAppId::" + serverToken, defaultValue); #else return ""; #endif - } + } - public static void SetAppServerToken(string appId, string token) - { + public static void SetAppServerToken(string appId, string token) + { #if UNITY_EDITOR - EditorPrefs.SetString("Wit::AppIdToToken::" + appId, token); - EditorPrefs.SetString("Wit::TokenToAppId::" + token, appId); + EditorPrefs.SetString("Wit::AppIdToToken::" + appId, token); + EditorPrefs.SetString("Wit::TokenToAppId::" + token, appId); #endif - } + } - private static void SavePrefs() - { + private static void SavePrefs() + { - } + } - public static string ServerToken - { -#if UNITY_EDITOR - get + public static string ServerToken { - if (null == serverToken) +#if UNITY_EDITOR + get { - try - { - serverToken = EditorPrefs.GetString("Wit::ServerToken", ""); - } - catch (Exception e) + if (null == serverToken) { - // This will happen if we don't prime the server token on the main thread and - // we access the server token editorpref value in a request. - Debug.LogError(e.Message); + try + { + serverToken = EditorPrefs.GetString("Wit::ServerToken", ""); + } + catch (Exception e) + { + // This will happen if we don't prime the server token on the main thread and + // we access the server token editorpref value in a request. + Debug.LogError(e.Message); + } } - } - return serverToken; - } - set - { - serverToken = value; - EditorPrefs.SetString("Wit::ServerToken", serverToken); - } + return serverToken; + } + set + { + serverToken = value; + EditorPrefs.SetString("Wit::ServerToken", serverToken); + } #else get => ""; #endif - } + } - public class DefaultTokenValidatorProvider : ITokenValidationProvider - { - public bool IsTokenValid(string appId, string token) + public class DefaultTokenValidatorProvider : ITokenValidationProvider { - return IsServerTokenValid(token); + public bool IsTokenValid(string appId, string token) + { + return IsServerTokenValid(token); + } + + public bool IsServerTokenValid(string serverToken) + { + return null != serverToken && serverToken.Length == 32; + } } - public bool IsServerTokenValid(string serverToken) + public interface ITokenValidationProvider { - return null != serverToken && serverToken.Length == 32; + bool IsTokenValid(string appId, string token); + bool IsServerTokenValid(string serverToken); } - } - - public interface ITokenValidationProvider - { - bool IsTokenValid(string appId, string token); - bool IsServerTokenValid(string serverToken); - } #if UNITY_EDITOR - public static void InitEditorTokens() - { - if (null == serverToken) + public static void InitEditorTokens() { - serverToken = EditorPrefs.GetString("Wit::ServerToken", ""); + if (null == serverToken) + { + serverToken = EditorPrefs.GetString("Wit::ServerToken", ""); + } } - } #endif + } } diff --git a/Scripts/Runtime/WitRequest.cs b/Scripts/Runtime/WitRequest.cs index cbbcf6d7..5b4bbd2c 100644 --- a/Scripts/Runtime/WitRequest.cs +++ b/Scripts/Runtime/WitRequest.cs @@ -10,12 +10,13 @@ using System.Linq; using System.Net; using System.Text; -using com.facebook.witai.data; -using com.facebook.witai.lib; +using Facebook.WitAi.Data; +using Facebook.WitAi.Data.Configuration; +using Facebook.WitAi.Lib; using UnityEngine; using SystemInfo = UnityEngine.SystemInfo; -namespace com.facebook.witai +namespace Facebook.WitAi { /// /// Manages a single request lifecycle when sending/receiving data from Wit.ai. diff --git a/Scripts/Runtime/WitRequestFactory.cs b/Scripts/Runtime/WitRequestFactory.cs index e576cf50..53e1e421 100644 --- a/Scripts/Runtime/WitRequestFactory.cs +++ b/Scripts/Runtime/WitRequestFactory.cs @@ -4,14 +4,13 @@ * This source code is licensed under the license found in the * LICENSE file in the root directory of this source tree. */ -using UnityEngine; + using System.Text; -using com.facebook.witai.data; -using com.facebook.witai.interfaces; -using System.Collections; using System.Collections.Generic; +using Facebook.WitAi.Configuration; +using Facebook.WitAi.Data.Configuration; -namespace com.facebook.witai +namespace Facebook.WitAi { public static class WitRequestFactory { diff --git a/Scripts/Runtime/WitResultUtilities.cs b/Scripts/Runtime/WitResultUtilities.cs index c6d225f9..ca4cf7af 100644 --- a/Scripts/Runtime/WitResultUtilities.cs +++ b/Scripts/Runtime/WitResultUtilities.cs @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -using com.facebook.witai.lib; +using Facebook.WitAi.Lib; -namespace com.facebook.witai +namespace Facebook.WitAi { public static class WitResultUtilities { From 3d7d7d0aa45d8c3c4da433bd175aadfbba00ac17 Mon Sep 17 00:00:00 2001 From: Aaron Jackson Date: Tue, 21 Sep 2021 22:58:47 -0700 Subject: [PATCH 2/3] Bump version --- Scripts/Runtime/WitRequest.cs | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Scripts/Runtime/WitRequest.cs b/Scripts/Runtime/WitRequest.cs index 5b4bbd2c..979333e6 100644 --- a/Scripts/Runtime/WitRequest.cs +++ b/Scripts/Runtime/WitRequest.cs @@ -47,7 +47,7 @@ public class WitRequest const string URI_AUTHORITY = "api.wit.ai"; const string WIT_API_VERSION = "20210922"; - private const string WIT_SDK_VERSION = "0.0.12"; + private const string WIT_SDK_VERSION = "0.0.13"; private WitConfiguration configuration; diff --git a/package.json b/package.json index 54a74e4e..a567ae95 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.facebook.witai", "displayName": "Wit.ai", - "version": "0.0.12", + "version": "0.0.13", "samples": [ { "displayName": "Response Debugger", @@ -16,4 +16,4 @@ ], "description": "wit-unity is the Unity SDK for Wit.ai. It provides convenience tools for activating Wit and processing the responses that are returned.", "unity": "2019.4" -} +} \ No newline at end of file From 580a088c02f4a63e332fe58650551517eb5d2a53 Mon Sep 17 00:00:00 2001 From: Aaron Jackson Date: Wed, 22 Sep 2021 08:02:44 -0700 Subject: [PATCH 3/3] Fixed spacing and sample packages --- Samples/ResponseDebugger/Scripts/WitUIInteractionHandler.cs | 4 ++-- Samples/Shapes/Scripts/ColorChanger.cs | 5 +++-- Samples/Shapes/Scripts/WitUIInteractionHandler.cs | 4 ++-- .../Editor/Data/Configuration/IApplicationDetailProvider.cs | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Samples/ResponseDebugger/Scripts/WitUIInteractionHandler.cs b/Samples/ResponseDebugger/Scripts/WitUIInteractionHandler.cs index 4932b2f8..33f52cb0 100644 --- a/Samples/ResponseDebugger/Scripts/WitUIInteractionHandler.cs +++ b/Samples/ResponseDebugger/Scripts/WitUIInteractionHandler.cs @@ -6,11 +6,11 @@ */ using System.Net; -using com.facebook.witai.lib; +using Facebook.WitAi.Lib; using TMPro; using UnityEngine; -namespace com.facebook.witai.samples.responsedebugger +namespace Facebook.WitAi.Samples.ResponseDebugger { public class WitUIInteractionHandler : MonoBehaviour { diff --git a/Samples/Shapes/Scripts/ColorChanger.cs b/Samples/Shapes/Scripts/ColorChanger.cs index 227c1feb..235357d2 100644 --- a/Samples/Shapes/Scripts/ColorChanger.cs +++ b/Samples/Shapes/Scripts/ColorChanger.cs @@ -5,10 +5,11 @@ * LICENSE file in the root directory of this source tree. */ -using com.facebook.witai.lib; +using Facebook.WitAi; +using Facebook.WitAi.Lib; using UnityEngine; -namespace com.facebook.witai.demo +namespace Facebook.WitAi.Samples.Shapes { public class ColorChanger : MonoBehaviour { diff --git a/Samples/Shapes/Scripts/WitUIInteractionHandler.cs b/Samples/Shapes/Scripts/WitUIInteractionHandler.cs index eb45699d..1236c9e5 100644 --- a/Samples/Shapes/Scripts/WitUIInteractionHandler.cs +++ b/Samples/Shapes/Scripts/WitUIInteractionHandler.cs @@ -5,11 +5,11 @@ * LICENSE file in the root directory of this source tree. */ -using com.facebook.witai.lib; +using Facebook.WitAi.Lib; using TMPro; using UnityEngine; -namespace com.facebook.witai.samples.shapes +namespace Facebook.WitAi.Samples.Shapes { public class WitUIInteractionHandler : MonoBehaviour { diff --git a/Scripts/Editor/Data/Configuration/IApplicationDetailProvider.cs b/Scripts/Editor/Data/Configuration/IApplicationDetailProvider.cs index 0db9b605..660eee77 100644 --- a/Scripts/Editor/Data/Configuration/IApplicationDetailProvider.cs +++ b/Scripts/Editor/Data/Configuration/IApplicationDetailProvider.cs @@ -9,6 +9,6 @@ namespace Facebook.WitAi.Data.Configuration { public interface IApplicationDetailProvider { - void DrawApplication(WitApplication application); + void DrawApplication(WitApplication application); } }