ydeng/recrownedathenaeum
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor.

Browse Source
This commit is contained in:
Harrison Deng 2019-01-27 17:39:18 -06:00
parent 2788d9d349
commit 9d84b641db
15 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RecrownedAthenaeum/Data/SkinData.cs
View File

@ -1,5 +1,5 @@
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using RecrownedAthenaeum.UI.Skin.Definitions; using RecrownedAthenaeum.UI.SkinSystem.Definitions;
namespace RecrownedAthenaeum.Data namespace RecrownedAthenaeum.Data
{ {

20
RecrownedAthenaeum/RecrownedAthenaeum.csproj
View File

@ -77,23 +77,23 @@
<Compile Include="ScreenSystem\LoadingScreen.cs" /> <Compile Include="ScreenSystem\LoadingScreen.cs" />
<Compile Include="ScreenSystem\Screen.cs" /> <Compile Include="ScreenSystem\Screen.cs" />
<Compile Include="ScreenSystem\ScreenManager.cs" /> <Compile Include="ScreenSystem\ScreenManager.cs" />
<Compile Include="UI\Book\Book.cs" /> <Compile Include="UI\BookSystem\Book.cs" />
<Compile Include="UI\Book\Page.cs" /> <Compile Include="UI\BookSystem\Page.cs" />
<Compile Include="UI\Modular\Modules\Image.cs" /> <Compile Include="UI\Modular\Modules\Image.cs" />
<Compile Include="UI\Modular\Modules\Interactive\Button.cs" /> <Compile Include="UI\Modular\Modules\Interactive\Button.cs" />
<Compile Include="UI\Modular\Modules\Interactive\TextButton.cs" /> <Compile Include="UI\Modular\Modules\Interactive\TextButton.cs" />
<Compile Include="UI\Modular\Modules\Text.cs" /> <Compile Include="UI\Modular\Modules\Text.cs" />
<Compile Include="UI\Modular\UIModule.cs" /> <Compile Include="UI\Modular\UIModule.cs" />
<Compile Include="UI\Modular\UIModuleGroup.cs" /> <Compile Include="UI\Modular\UIModuleGroup.cs" />
<Compile Include="UI\Skin\Definitions\ButtonSkinDefinition.cs" /> <Compile Include="UI\SkinSystem\Definitions\ButtonSkinDefinition.cs" />
<Compile Include="UI\Skin\Definitions\ISkinDefinition.cs" /> <Compile Include="UI\SkinSystem\Definitions\ISkinDefinition.cs" />
<Compile Include="UI\Skin\Definitions\TextButtonSkinDefinition.cs" /> <Compile Include="UI\SkinSystem\Definitions\TextButtonSkinDefinition.cs" />
<Compile Include="UI\Skin\Definitions\TextSkinDefinition.cs" /> <Compile Include="UI\SkinSystem\Definitions\TextSkinDefinition.cs" />
<Compile Include="UI\Skin\ISkin.cs" /> <Compile Include="UI\SkinSystem\ISkin.cs" />
<Compile Include="UI\Skin\Skin.cs" /> <Compile Include="UI\SkinSystem\Skin.cs" />
<Compile Include="Data\SkinData.cs" /> <Compile Include="Data\SkinData.cs" />
<Compile Include="UI\Skin\SkinManager.cs" /> <Compile Include="UI\SkinSystem\SkinManager.cs" />
<Compile Include="UI\Skin\MergedSkin.cs" /> <Compile Include="UI\SkinSystem\MergedSkin.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <None Include="packages.config" />

2
RecrownedAthenaeum/UI/Book/Book.cs → RecrownedAthenaeum/UI/BookSystem/Book.cs
View File

@ -5,7 +5,7 @@ using RecrownedAthenaeum.ContentSystem;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
namespace RecrownedAthenaeum.UI.Book namespace RecrownedAthenaeum.UI.BookSystem
{ {
/// <summary> /// <summary>
/// Contains the pages. /// Contains the pages.

2
RecrownedAthenaeum/UI/Book/Page.cs → RecrownedAthenaeum/UI/BookSystem/Page.cs
View File

@ -1,7 +1,7 @@
using RecrownedAthenaeum.ContentSystem; using RecrownedAthenaeum.ContentSystem;
using RecrownedAthenaeum.UI.Modular; using RecrownedAthenaeum.UI.Modular;
namespace RecrownedAthenaeum.UI.Book namespace RecrownedAthenaeum.UI.BookSystem
{ {
/// <summary> /// <summary>
/// A page a part of a <see cref="Book"/>. /// A page a part of a <see cref="Book"/>.

4
RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs
View File

@ -2,7 +2,7 @@
using Microsoft.Xna.Framework.Input; using Microsoft.Xna.Framework.Input;
using RecrownedAthenaeum.SpecialTypes; using RecrownedAthenaeum.SpecialTypes;
using RecrownedAthenaeum.Input; using RecrownedAthenaeum.Input;
using RecrownedAthenaeum.UI.Skin.Definitions; using RecrownedAthenaeum.UI.SkinSystem.Definitions;
namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive
{ {
@ -53,7 +53,7 @@ namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive
/// </summary> /// </summary>
/// <param name="skin">The skin containing the information of the textures and design to follow.</param> /// <param name="skin">The skin containing the information of the textures and design to follow.</param>
/// <param name="definitionName">The name of the definition in the skin. Can be null to select the default.</param> /// <param name="definitionName">The name of the definition in the skin. Can be null to select the default.</param>
public Button(Skin.Skin skin, string definitionName = null) public Button(SkinSystem.Skin skin, string definitionName = null)
{ {
skinDefinition = skin.ObtainDefinition<ButtonSkinDefinition>(definitionName, GetType()); skinDefinition = skin.ObtainDefinition<ButtonSkinDefinition>(definitionName, GetType());
downTexture = skin.GetTextureAtlasRegion(skinDefinition.downRegion); downTexture = skin.GetTextureAtlasRegion(skinDefinition.downRegion);

4
RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs
View File

@ -1,7 +1,7 @@
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using RecrownedAthenaeum.SpecialTypes; using RecrownedAthenaeum.SpecialTypes;
using RecrownedAthenaeum.UI.Skin.Definitions; using RecrownedAthenaeum.UI.SkinSystem.Definitions;
namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive
{ {
@ -41,7 +41,7 @@ namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive
/// <param name="font">The font to be used.</param> /// <param name="font">The font to be used.</param>
/// <param name="skin">The skin to use.</param> /// <param name="skin">The skin to use.</param>
/// <param name="definitionName">Name of the definition for this type in the skin given.</param> /// <param name="definitionName">Name of the definition for this type in the skin given.</param>
public TextButton(string text, SpriteFont font, Skin.Skin skin, string definitionName = null) : base(skin, definitionName) public TextButton(string text, SpriteFont font, SkinSystem.Skin skin, string definitionName = null) : base(skin, definitionName)
{ {
TextButtonSkinDefinition skinDefinition = skin.ObtainDefinition<TextButtonSkinDefinition>(definitionName, GetType()); TextButtonSkinDefinition skinDefinition = skin.ObtainDefinition<TextButtonSkinDefinition>(definitionName, GetType());
this.text = new Text(font, text); this.text = new Text(font, text);

4
RecrownedAthenaeum/UI/Modular/Modules/Text.cs
View File

@ -1,6 +1,6 @@
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using RecrownedAthenaeum.UI.Skin.Definitions; using RecrownedAthenaeum.UI.SkinSystem.Definitions;
using System.Text; using System.Text;
namespace RecrownedAthenaeum.UI.Modular.Modules namespace RecrownedAthenaeum.UI.Modular.Modules
@ -61,7 +61,7 @@ namespace RecrownedAthenaeum.UI.Modular.Modules
/// <param name="skinDefinitionName">The name of the skin's definition to use of a <see cref="TextSkinDefinition"/>.</param> /// <param name="skinDefinitionName">The name of the skin's definition to use of a <see cref="TextSkinDefinition"/>.</param>
/// <param name="font">The font to be used.</param> /// <param name="font">The font to be used.</param>
/// <param name="content">The string of text to be displayed.</param> /// <param name="content">The string of text to be displayed.</param>
public Text(Skin.Skin skin, SpriteFont font, string skinDefinitionName = null, string content = null) : this(font, content) public Text(SkinSystem.Skin skin, SpriteFont font, string skinDefinitionName = null, string content = null) : this(font, content)
{ {
skinDefinition = skin.ObtainDefinition<TextSkinDefinition>(skinDefinitionName, GetType()); skinDefinition = skin.ObtainDefinition<TextSkinDefinition>(skinDefinitionName, GetType());
color = skin.GetColor(skinDefinition.color); color = skin.GetColor(skinDefinition.color);

2
RecrownedAthenaeum/UI/Skin/Definitions/ButtonSkinDefinition.cs → RecrownedAthenaeum/UI/SkinSystem/Definitions/ButtonSkinDefinition.cs
View File

@ -1,7 +1,7 @@
using RecrownedAthenaeum.UI.Modular.Modules.Interactive; using RecrownedAthenaeum.UI.Modular.Modules.Interactive;
using System; using System;
namespace RecrownedAthenaeum.UI.Skin.Definitions namespace RecrownedAthenaeum.UI.SkinSystem.Definitions
{ {
/// <summary> /// <summary>
/// Definition for a button. /// Definition for a button.

2
RecrownedAthenaeum/UI/Skin/Definitions/ISkinDefinition.cs → RecrownedAthenaeum/UI/SkinSystem/Definitions/ISkinDefinition.cs
View File

@ -1,6 +1,6 @@
using System; using System;
namespace RecrownedAthenaeum.UI.Skin.Definitions namespace RecrownedAthenaeum.UI.SkinSystem.Definitions
{ {
/// <summary> /// <summary>
/// A definition containing the data for the skin system. Should be in data transfer object model. /// A definition containing the data for the skin system. Should be in data transfer object model.

2
RecrownedAthenaeum/UI/Skin/Definitions/TextButtonSkinDefinition.cs → RecrownedAthenaeum/UI/SkinSystem/Definitions/TextButtonSkinDefinition.cs
View File

@ -1,7 +1,7 @@
using RecrownedAthenaeum.UI.Modular.Modules.Interactive; using RecrownedAthenaeum.UI.Modular.Modules.Interactive;
using System; using System;
namespace RecrownedAthenaeum.UI.Skin.Definitions namespace RecrownedAthenaeum.UI.SkinSystem.Definitions
{ {
/// <summary> /// <summary>
/// Definition for a text button for a skin theme. /// Definition for a text button for a skin theme.

2
RecrownedAthenaeum/UI/Skin/Definitions/TextSkinDefinition.cs → RecrownedAthenaeum/UI/SkinSystem/Definitions/TextSkinDefinition.cs
View File

@ -1,7 +1,7 @@
using System; using System;
using static System.Net.Mime.MediaTypeNames; using static System.Net.Mime.MediaTypeNames;
namespace RecrownedAthenaeum.UI.Skin.Definitions namespace RecrownedAthenaeum.UI.SkinSystem.Definitions
{ {
class TextSkinDefinition : ISkinDefinitionData class TextSkinDefinition : ISkinDefinitionData
{ {

4
RecrownedAthenaeum/UI/Skin/ISkin.cs → RecrownedAthenaeum/UI/SkinSystem/ISkin.cs
View File

@ -2,9 +2,9 @@
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using RecrownedAthenaeum.SpecialTypes; using RecrownedAthenaeum.SpecialTypes;
using RecrownedAthenaeum.UI.Skin.Definitions; using RecrownedAthenaeum.UI.SkinSystem.Definitions;
namespace RecrownedAthenaeum.UI.Skin namespace RecrownedAthenaeum.UI.SkinSystem
{ {
/// <summary> /// <summary>
/// The output requirements of a skin. This allows for very customized skin systems if needed. /// The output requirements of a skin. This allows for very customized skin systems if needed.

4
RecrownedAthenaeum/UI/Skin/MergedSkin.cs → RecrownedAthenaeum/UI/SkinSystem/MergedSkin.cs
View File

@ -3,9 +3,9 @@ using System.Collections.Generic;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using RecrownedAthenaeum.SpecialTypes; using RecrownedAthenaeum.SpecialTypes;
using RecrownedAthenaeum.UI.Skin.Definitions; using RecrownedAthenaeum.UI.SkinSystem.Definitions;
namespace RecrownedAthenaeum.UI.Skin namespace RecrownedAthenaeum.UI.SkinSystem
{ {
internal class MergedSkin : ISkin internal class MergedSkin : ISkin
{ {

4
RecrownedAthenaeum/UI/Skin/Skin.cs → RecrownedAthenaeum/UI/SkinSystem/Skin.cs
View File

@ -1,11 +1,11 @@
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using RecrownedAthenaeum.SpecialTypes; using RecrownedAthenaeum.SpecialTypes;
using RecrownedAthenaeum.UI.Skin.Definitions; using RecrownedAthenaeum.UI.SkinSystem.Definitions;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace RecrownedAthenaeum.UI.Skin namespace RecrownedAthenaeum.UI.SkinSystem
{ {
/// <summary> /// <summary>
/// A skin is used to group a theme which can then be applied to the UI via the use of modules. /// A skin is used to group a theme which can then be applied to the UI via the use of modules.

2
RecrownedAthenaeum/UI/Skin/SkinManager.cs → RecrownedAthenaeum/UI/SkinSystem/SkinManager.cs
View File

@ -9,7 +9,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Threading; using System.Threading;
namespace RecrownedAthenaeum.UI.Skin namespace RecrownedAthenaeum.UI.SkinSystem
{ {
/// <summary> /// <summary>
/// Called when the skin manager has completed a async action. /// Called when the skin manager has completed a async action.