Merge pull request #51 from wit-ai/pullrequest-namespace-refactor

Refactor namespace to follow C# standards
wit-ai · Sep 22, 2021 · fd036a6 · fd036a6
2 parents 276b240 + 580a088
commit fd036a6
Show file tree

Hide file tree

Showing 88 changed files with 287 additions and 255 deletions.
diff --git 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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
diff --git a/Scripts/Editor/Configuration.meta → Scripts/Editor/Data/Configuration.meta b/Scripts/Editor/Configuration.meta → Scripts/Editor/Data/Configuration.meta
diff --git a/...nfiguration/IApplicationDetailProvider.cs → ...nfiguration/IApplicationDetailProvider.cs b/...nfiguration/IApplicationDetailProvider.cs → ...nfiguration/IApplicationDetailProvider.cs
@@ -4,12 +4,11 @@
  * 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
     {
-    	void DrawApplication(WitApplication application);
+        void DrawApplication(WitApplication application);
     }
 }
diff --git a/...ration/IApplicationDetailProvider.cs.meta → ...ration/IApplicationDetailProvider.cs.meta b/...ration/IApplicationDetailProvider.cs.meta → ...ration/IApplicationDetailProvider.cs.meta
diff --git a/Scripts/Editor/Data/Configuration/WitApplicationDetailProvider.cs 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/...tion/WitApplicationDetailProvider.cs.meta → ...tion/WitApplicationDetailProvider.cs.meta b/...tion/WitApplicationDetailProvider.cs.meta → ...tion/WitApplicationDetailProvider.cs.meta
diff --git a/...r/Configuration/WitConfigurationEditor.cs → ...a/Configuration/WitConfigurationEditor.cs b/...r/Configuration/WitConfigurationEditor.cs → ...a/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/...figuration/WitConfigurationEditor.cs.meta → ...figuration/WitConfigurationEditor.cs.meta b/...figuration/WitConfigurationEditor.cs.meta → ...figuration/WitConfigurationEditor.cs.meta
diff --git a/.../Configuration/WitConfigurationUtility.cs → .../Configuration/WitConfigurationUtility.cs b/.../Configuration/WitConfigurationUtility.cs → .../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/...iguration/WitConfigurationUtility.cs.meta → ...iguration/WitConfigurationUtility.cs.meta b/...iguration/WitConfigurationUtility.cs.meta → ...iguration/WitConfigurationUtility.cs.meta
diff --git a/Scripts/Editor/Configuration/WitWindow.cs → ...ts/Editor/Data/Configuration/WitWindow.cs b/Scripts/Editor/Configuration/WitWindow.cs → ...ts/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/...ts/Editor/Configuration/WitWindow.cs.meta → ...itor/Data/Configuration/WitWindow.cs.meta b/...ts/Editor/Configuration/WitWindow.cs.meta → ...itor/Data/Configuration/WitWindow.cs.meta
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
     {