Skip to content

Commit

Permalink
feat: move to UIComponents namespace from UIComponents.Core
Browse files Browse the repository at this point in the history
BREAKING CHANGE: All core code is now located in the UIComponents namespace, as opposed to UIComponents.Core.
  • Loading branch information
jonisavo committed May 5, 2022
1 parent bb13835 commit 7efa0db
Show file tree
Hide file tree
Showing 27 changed files with 16 additions and 32 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using UIComponents.Core;
using UIComponents;
using UIComponents.Addressables;

namespace UIComponentsExamples.Addressables
Expand Down
2 changes: 1 addition & 1 deletion Assets/Examples/Counter/CounterComponent.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using UIComponents.Core;
using UIComponents;
using UnityEngine.UIElements;

namespace UIComponentsExamples
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using UIComponents.Core;
using UIComponents;
using UIComponents.Editor;

namespace UIComponentsExamples.Editor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using UIComponents.Core;
using UIComponents;

namespace UIComponentsExamples
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using UIComponents.Addressables;
using UnityEngine.UIElements;

namespace UIComponents.Tests.Editor
namespace UIComponents.Tests.Addressables
{
[TestFixture]
public class AddressableAssetResolverTests : AssetResolverTestSuite<AddressableAssetResolver>
Expand Down
1 change: 0 additions & 1 deletion Assets/UIComponents.Tests/AssetPathAttributeTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System.Linq;
using NSubstitute;
using NUnit.Framework;
using UIComponents.Core;

namespace UIComponents.Tests
{
Expand Down
1 change: 0 additions & 1 deletion Assets/UIComponents.Tests/AssetResolverTestSuite.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using NUnit.Framework;
using UIComponents.Core;

namespace UIComponents.Tests
{
Expand Down
2 changes: 0 additions & 2 deletions Assets/UIComponents.Tests/DependencyInjectorStaticTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using NUnit.Framework;
using UIComponents.Core;
using UIComponents.Core.Exceptions;

namespace UIComponents.Tests
{
Expand Down
2 changes: 0 additions & 2 deletions Assets/UIComponents.Tests/DependencyInjectorTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using System;
using NUnit.Framework;
using UIComponents.Core;
using UIComponents.Core.Exceptions;

namespace UIComponents.Tests
{
Expand Down
1 change: 0 additions & 1 deletion Assets/UIComponents.Tests/LayoutAttributeTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using NSubstitute;
using NUnit.Framework;
using UIComponents.Core;
using UnityEngine;
using UnityEngine.UIElements;

Expand Down
1 change: 0 additions & 1 deletion Assets/UIComponents.Tests/PathAttributeTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using NSubstitute;
using NUnit.Framework;
using UIComponents.Core;

namespace UIComponents.Tests
{
Expand Down
1 change: 0 additions & 1 deletion Assets/UIComponents.Tests/ResourcesAssetResolverTests.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using NUnit.Framework;
using UIComponents.Core;
using UnityEngine.UIElements;

namespace UIComponents.Tests
Expand Down
1 change: 0 additions & 1 deletion Assets/UIComponents.Tests/StylesheetAttributeTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using NSubstitute;
using NSubstitute.ReturnsExtensions;
using NUnit.Framework;
using UIComponents.Core;
using UnityEngine;
using UnityEngine.TestTools;
using UnityEngine.UIElements;
Expand Down
1 change: 0 additions & 1 deletion Assets/UIComponents.Tests/UIComponentDependencyTests.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using NUnit.Framework;
using UIComponents.Core;

namespace UIComponents.Tests
{
Expand Down
1 change: 0 additions & 1 deletion Assets/UIComponents.Tests/UIComponentNoAttributesTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System.Linq;
using NSubstitute;
using NUnit.Framework;
using UIComponents.Core;
using UnityEngine.UIElements;

namespace UIComponents.Tests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Collections.Generic;
using UIComponents.Core;
using UnityEngine.ResourceManagement.AsyncOperations;

namespace UIComponents.Addressables
Expand Down
2 changes: 1 addition & 1 deletion Assets/UIComponents/Core/AssetPathAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using JetBrains.Annotations;

namespace UIComponents.Core
namespace UIComponents
{
/// <summary>
/// If present, specifies a base path of assets configured for a UIComponent.
Expand Down
2 changes: 1 addition & 1 deletion Assets/UIComponents/Core/DependencyAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace UIComponents.Core
namespace UIComponents
{
/// <summary>
/// Used to define a dependency for a UIComponent.
Expand Down
3 changes: 1 addition & 2 deletions Assets/UIComponents/Core/DependencyInjector.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System;
using System.Collections.Generic;
using JetBrains.Annotations;
using UIComponents.Core.Exceptions;

namespace UIComponents.Core
namespace UIComponents
{
/// <summary>
/// The class responsible for providing UIComponents with their
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace UIComponents.Core.Exceptions
namespace UIComponents
{
/// <summary>
/// Thrown when a dependency does not have a provider.
Expand Down
2 changes: 1 addition & 1 deletion Assets/UIComponents/Core/IAssetResolver.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace UIComponents.Core
namespace UIComponents
{
/// <summary>
/// An interface for classes whose purpose is to load assets
Expand Down
2 changes: 1 addition & 1 deletion Assets/UIComponents/Core/LayoutAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using JetBrains.Annotations;

namespace UIComponents.Core
namespace UIComponents
{
/// <summary>
/// Specifies the path to the .uxml layout file used by a UIComponent.
Expand Down
2 changes: 1 addition & 1 deletion Assets/UIComponents/Core/PathAttribute.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using UnityEditor;
using UnityEngine;

namespace UIComponents.Core
namespace UIComponents
{
/// <summary>
/// A base class for attributes which store a path to an asset.
Expand Down
2 changes: 1 addition & 1 deletion Assets/UIComponents/Core/ResourcesAssetResolver.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace UIComponents.Core
namespace UIComponents
{
/// <summary>
/// An IAssetResolver which loads assets from Resources. Used
Expand Down
2 changes: 1 addition & 1 deletion Assets/UIComponents/Core/StylesheetAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using JetBrains.Annotations;

namespace UIComponents.Core
namespace UIComponents
{
/// <summary>
/// Specifies the path to a .uss stylesheet file used by a UIComponent.
Expand Down
3 changes: 1 addition & 2 deletions Assets/UIComponents/Core/UIComponent.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
using System;
using System.Collections.Generic;
using UIComponents.Core.Exceptions;
using JetBrains.Annotations;
using UnityEngine;
using UnityEngine.UIElements;

namespace UIComponents.Core
namespace UIComponents
{
/// <summary>
/// A VisualElement which is configurable with various attributes like
Expand Down
3 changes: 1 addition & 2 deletions Assets/UIComponents/Editor/AssetDatabaseAssetResolver.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using UIComponents.Core;
using UnityEditor;
using UnityEditor;

namespace UIComponents.Editor
{
Expand Down

0 comments on commit 7efa0db

Please sign in to comment.