Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Assets/Stickers/Editor/StickerEditor.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using UnityEditor;
using UnityEngine;
using Agens.Stickers;

namespace Agens.Stickers
namespace Agens.StickersEditor
{
[CustomEditor(typeof(Sticker))]
public class StickerEditor : UnityEditor.Editor
public class StickerEditor : Editor
{
private SerializedProperty Frames;
private SerializedProperty Sequence;
Expand All @@ -19,12 +19,12 @@ public class StickerEditor : UnityEditor.Editor

private static GUIContent[] s_PlayIcons = new GUIContent[2];

private List<UnityEditor.Editor> textureEditors;
private List<Editor> textureEditors;

private MethodInfo RepaintMethod;
private object GUIView;

private UnityEditor.Editor currentTextureEditor
private Editor currentTextureEditor
{
get
{
Expand Down Expand Up @@ -173,7 +173,7 @@ public override void OnInteractivePreviewGUI(Rect r, GUIStyle background)
{
if (RepaintMethod == null)
{
var type = typeof(UnityEditor.Editor).Assembly.GetType("UnityEditor.GUIView");
var type = typeof(Editor).Assembly.GetType("UnityEditor.GUIView");
var prop = type.GetProperty("current", BindingFlags.Static | BindingFlags.Public);
GUIView = prop.GetValue(null, null);
RepaintMethod = GUIView.GetType().GetMethod("Repaint", BindingFlags.Public | BindingFlags.Instance);
Expand Down Expand Up @@ -203,7 +203,7 @@ private void CreateTextureEditor()
{
var sticker = serializedObject;
var frames = sticker.FindProperty("Frames");
textureEditors = new List<UnityEditor.Editor>(frames.arraySize);
textureEditors = new List<Editor>(frames.arraySize);
for (int i = 0; i < frames.arraySize; i++)
{
var firstFrame = frames.GetArrayElementAtIndex(i);
Expand Down
2 changes: 1 addition & 1 deletion Assets/Stickers/Editor/StickerEditorUtility.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Globalization;

namespace Agens.Stickers
namespace Agens.StickersEditor
{
public static class StickerEditorUtility
{
Expand Down
10 changes: 5 additions & 5 deletions Assets/Stickers/Editor/StickerPackEditor.cs
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using UnityEditor;
using UnityEditor.AnimatedValues;
using UnityEditorInternal;
using UnityEngine;
using Agens.Stickers;
using Object = UnityEngine.Object;
#if UNITY_5_5_OR_NEWER
using UnityEngine.Profiling;
#endif

namespace Agens.Stickers
namespace Agens.StickersEditor
{
[CustomEditor(typeof(StickerPack))]
public class StickerPackEditor : UnityEditor.Editor
public class StickerPackEditor : Editor
{

public static readonly int[] ValidSizes = new int[3] {300, 408, 618};
Expand Down Expand Up @@ -648,7 +648,7 @@ private void RepaintView()
{
if (repaintMethod == null)
{
var type = typeof(UnityEditor.Editor).Assembly.GetType("UnityEditor.GUIView");
var type = typeof(Editor).Assembly.GetType("UnityEditor.GUIView");
var prop = type.GetProperty("current", BindingFlags.Static | BindingFlags.Public);
guiView = prop.GetValue(null, null);
repaintMethod = guiView.GetType().GetMethod("Repaint", BindingFlags.Public | BindingFlags.Instance);
Expand Down
8 changes: 3 additions & 5 deletions Assets/Stickers/Editor/StickerTest.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
using System.IO;
using Agens;
using UnityEngine;
using UnityEditor;
using UnityEditor;
using NUnit.Framework;
using Agens.Stickers;

namespace Agens.Stickers
namespace Agens.StickersEditor
{
public class StickerTest
{
Expand Down
2 changes: 1 addition & 1 deletion Assets/Stickers/Editor/StickersBuildPostProcess.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using UnityEditor;
using UnityEditor.Callbacks;

namespace Agens.Stickers
namespace Agens.StickersEditor
{
public class StickersBuildPostprocessor
{
Expand Down
5 changes: 3 additions & 2 deletions Assets/Stickers/Editor/StickersExport.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
using System.IO;
using System.Linq;
using UnityEditor;
using UnityEditor.iOS.Xcode.Stickers;
using Agens.Stickers;
using Agens.StickersEditor.UnityEditor.iOS.Xcode;
using Application = UnityEngine.Application;

namespace Agens.Stickers
namespace Agens.StickersEditor
{
public static class StickersExport
{
Expand Down
8 changes: 8 additions & 0 deletions Assets/Stickers/Editor/Xcode.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.IO;
using System.Linq;

namespace UnityEditor.iOS.Xcode.Stickers
namespace Agens.StickersEditor.UnityEditor.iOS.Xcode
{
internal class DeviceTypeRequirement
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Text;
using System.Linq;

namespace UnityEditor.iOS.Xcode.Stickers
namespace Agens.StickersEditor.UnityEditor.iOS.Xcode
{
public class JsonElement
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections;
using System;

namespace UnityEditor.iOS.Xcode.PBX
namespace Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX
{
class PBXElement
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Linq;
using System;

namespace UnityEditor.iOS.Xcode.PBX
namespace Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX
{
enum TokenType
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Linq;
using System;

namespace UnityEditor.iOS.Xcode.PBX
namespace Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX
{
internal class PBXObjectData
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Linq;
using System;

namespace UnityEditor.iOS.Xcode.PBX
namespace Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX
{
class ValueAST {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

// Basr classes for section handling

namespace UnityEditor.iOS.Xcode.PBX
namespace Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX
{
// common base
internal abstract class SectionBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.IO;
using System.Linq;

namespace UnityEditor.iOS.Xcode.PBX
namespace Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX
{
class PropertyCommentChecker
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Text.RegularExpressions;
using System.IO;

namespace UnityEditor.iOS.Xcode.PBX
namespace Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX
{
internal class GUIDToCommentMap
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
using System.Text.RegularExpressions;
using System.IO;
using System;
using UnityEditor.iOS.Xcode.PBX;
using Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX;
using UnityEngine;

namespace UnityEditor.iOS.Xcode.Stickers
namespace Agens.StickersEditor.UnityEditor.iOS.Xcode
{
using PBXBuildFileSection = KnownSectionBase<PBXBuildFileData>;
using PBXFileReferenceSection = KnownSectionBase<PBXFileReferenceData>;
Expand All @@ -25,7 +25,7 @@ namespace UnityEditor.iOS.Xcode.Stickers
using XCConfigurationListSection = KnownSectionBase<XCConfigurationListData>;
using UnknownSection = KnownSectionBase<PBXObjectData>;

/*// Determines the tree the given path is relative to
// Determines the tree the given path is relative to
public enum PBXSourceTree
{
Absolute, // The path is absolute
Expand All @@ -35,7 +35,7 @@ public enum PBXSourceTree
Build, // The path is relative to the build products folder
Developer, // The path is relative to the developer folder
Sdk // The path is relative to the sdk folder
};*/
};

public class PBXProject
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
using System.Text.RegularExpressions;
using System.IO;
using System;
using UnityEditor.iOS.Xcode.PBX;
using Agens.StickersEditor.UnityEditor.iOS.Xcode.PBX;

namespace UnityEditor.iOS.Xcode
namespace Agens.StickersEditor.UnityEditor.iOS.Xcode
{
using PBXBuildFileSection = KnownSectionBase<PBXBuildFileData>;
using PBXFileReferenceSection = KnownSectionBase<PBXFileReferenceData>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Xml.Linq;
using System.Xml.XPath;

namespace UnityEditor.iOS.Xcode.Stickers
namespace Agens.StickersEditor.UnityEditor.iOS.Xcode
{
public class PlistElement
{
Expand Down