Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
C# BREAKING: Reorganized project and added NameSpaces
  • Loading branch information
@manups4e
manups4e committed Jul 27, 2023
1 parent 65c400f commit 8ada9ee
Show file tree
Hide file tree
Showing 62 changed files with 108 additions and 88 deletions.
3 changes: 2 additions & 1 deletion MenuExample/MenuExample.cs
View file
Expand Up @@ -4,6 +4,7 @@
using ScaleformUI;
using ScaleformUI.Elements;
using ScaleformUI.LobbyMenu;
using ScaleformUI.Menu;
using ScaleformUI.PauseMenu;
using System;
using System.Collections.Generic;
Expand Down Expand Up @@ -933,7 +934,7 @@ public void ExampleMenu()
sender.AnimationType = (MenuAnimationType)index;
};

exampleMenu.OnMenuOpen += (menu) =>
exampleMenu.OnMenuOpen += (menu, data) =>
{
Screen.ShowSubtitle($"{menu.Title} just opened!", 3000);
Debug.WriteLine($"{menu.Title} just opened!");
Expand Down
2 changes: 1 addition & 1 deletion ScaleformUI_Csharp/Colors.cs → ScaleformUI_Csharp/Elements/Colors.cs
View file
@@ -1,6 +1,6 @@
using System.Drawing;

namespace ScaleformUI
namespace ScaleformUI.Elements
{
public static class Colors
{
Expand Down
3 changes: 1 addition & 2 deletions ScaleformUI_Csharp/Controls.cs → ScaleformUI_Csharp/Elements/Controls.cs
View file
@@ -1,8 +1,7 @@
using CitizenFX.Core;
using System.Linq;
using static CitizenFX.Core.Native.API;

namespace ScaleformUI
namespace ScaleformUI.Elements
{
/// <summary>
/// Class that provides tools to handle the game controls.
Expand Down
7 changes: 3 additions & 4 deletions ScaleformUI_Csharp/PointExtensions.cs → ...formUI_Csharp/Elements/PointExtensions.cs
View file
@@ -1,8 +1,7 @@
using CitizenFX.Core;
using System;
using System.Drawing;

namespace ScaleformUI
namespace ScaleformUI.Elements
{
public static class MiscExtensions
{
Expand Down Expand Up @@ -65,8 +64,8 @@ public static float LinearFloatLerp(float start, float end, int currentTime, int

public static float QuadraticEasingLerp(float start, float end, int currentTime, int duration)
{
var time = (float)currentTime;
var dur = (float)duration;
float time = currentTime;
float dur = duration;

float change = end - start;

Expand Down
7 changes: 1 addition & 6 deletions ScaleformUI_Csharp/ScaleformFonts.cs → ...eformUI_Csharp/Elements/ScaleformFonts.cs
View file
@@ -1,11 +1,6 @@
using CitizenFX.Core.Native;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace ScaleformUI
namespace ScaleformUI.Elements
{
public static class ScaleformFonts
{
Expand Down
3 changes: 1 addition & 2 deletions ScaleformUI_Csharp/ScreenTools.cs → ScaleformUI_Csharp/Elements/ScreenTools.cs
View file
@@ -1,11 +1,10 @@
using CitizenFX.Core;
using CitizenFX.Core.Native;
using CitizenFX.Core.UI;
using System;
using System.Drawing;
using static CitizenFX.Core.Native.API;

namespace ScaleformUI
namespace ScaleformUI.Elements
{
/// <summary>
/// Tools to deal with the game screen.
Expand Down
15 changes: 7 additions & 8 deletions ScaleformUI_Csharp/Elements/UIResText.cs
View file
@@ -1,10 +1,9 @@
using CitizenFX.Core.Native;
using CitizenFX.Core.UI;
using System;
using System.Drawing;
using Font = CitizenFX.Core.UI.Font;

namespace ScaleformUI
namespace ScaleformUI.Elements
{
/// <summary>
/// A Text object in the 1080 pixels height base system.
Expand Down Expand Up @@ -37,7 +36,7 @@ public UIResText(string caption, PointF position, float scale, Color color, Font
/// <param name="str"></param>
public static void AddLongString(string str)
{
var utf8ByteCount = System.Text.Encoding.UTF8.GetByteCount(str);
int utf8ByteCount = System.Text.Encoding.UTF8.GetByteCount(str);

if (utf8ByteCount == str.Length)
{
Expand Down Expand Up @@ -73,20 +72,20 @@ internal static void AddLongStringForUtf8(string input)
return;
}

var enc = System.Text.Encoding.UTF8;
System.Text.Encoding enc = System.Text.Encoding.UTF8;

var utf8ByteCount = enc.GetByteCount(input);
int utf8ByteCount = enc.GetByteCount(input);
if (utf8ByteCount < maxByteLengthPerString)
{
API.AddTextComponentString(input);
return;
}

var startIndex = 0;
int startIndex = 0;

for (int i = 0; i < input.Length; i++)
{
var length = i - startIndex;
int length = i - startIndex;
if (enc.GetByteCount(input.Substring(startIndex, length)) > maxByteLengthPerString)
{
string substr = (input.Substring(startIndex, length - 1));
Expand Down Expand Up @@ -125,7 +124,7 @@ public override void Draw(SizeF offset)
int screenh = Screen.Resolution.Height;
const float height = 1080f;
float ratio = (float)screenw / screenh;
var width = height * ratio;
float width = height * ratio;

float x = (Position.X) / width;
float y = (Position.Y) / height;
Expand Down
6 changes: 4 additions & 2 deletions ScaleformUI_Csharp/MenuHandler.cs → ScaleformUI_Csharp/Menus/MenuHandler.cs
View file
@@ -1,5 +1,7 @@
using CitizenFX.Core;
using CitizenFX.Core.Native;
using ScaleformUI.Menu;
using ScaleformUI.PauseMenus;

namespace ScaleformUI
{
Expand Down Expand Up @@ -41,7 +43,7 @@ public static PauseMenuBase CurrentPauseMenu
private set => currentBase = value;
}

public static async Task SwitchTo(this UIMenu currentMenu, UIMenu newMenu, int newMenuCurrentSelection = 0, bool inheritOldMenuParams = false)
public static async Task SwitchTo(this UIMenu currentMenu, UIMenu newMenu, int newMenuCurrentSelection = 0, bool inheritOldMenuParams = false, dynamic data = null)
{
if (currentMenu == null)
throw new ArgumentNullException("The menu you're switching from cannot be null.");
Expand Down Expand Up @@ -73,7 +75,7 @@ public static async Task SwitchTo(this UIMenu currentMenu, UIMenu newMenu, int n
currentMenu.Visible = false;
newMenu.Visible = true;
await currentMenu.FadeInMenu();
BreadcrumbsHandler.Forward(newMenu);
BreadcrumbsHandler.Forward(newMenu, data);
BreadcrumbsHandler.SwitchInProgress = false;
}

Expand Down
4 changes: 3 additions & 1 deletion ...formUI_Csharp/LobbyMenu/Columns/Column.cs → ...s/Pause Menus/LobbyMenu/Columns/Column.cs
View file
@@ -1,4 +1,6 @@
namespace ScaleformUI.LobbyMenu
using ScaleformUI.PauseMenus;

namespace ScaleformUI.LobbyMenu
{
public delegate void IndexChanged(int index);
public class Column
Expand Down
0 ...arp/LobbyMenu/Columns/PlayerListColumn.cs → ...nus/LobbyMenu/Columns/PlayerListColumn.cs
View file
File renamed without changes.
3 changes: 2 additions & 1 deletion ...p/LobbyMenu/Columns/SettingsListColumn.cs → ...s/LobbyMenu/Columns/SettingsListColumn.cs
View file
@@ -1,4 +1,5 @@
using ScaleformUI.PauseMenu;
using ScaleformUI.Menu;
using ScaleformUI.PauseMenu;

namespace ScaleformUI.LobbyMenu
{
Expand Down
0 ...ormUI_Csharp/LobbyMenu/Items/LobbyItem.cs → .../Pause Menus/LobbyMenu/Items/LobbyItem.cs
View file
File renamed without changes.
2 changes: 2 additions & 0 deletions ScaleformUI_Csharp/LobbyMenu/MainView.cs → ...p/Menus/Pause Menus/LobbyMenu/MainView.cs
View file
@@ -1,4 +1,6 @@
using CitizenFX.Core;
using ScaleformUI.Menu;
using ScaleformUI.PauseMenus;
using static CitizenFX.Core.Native.API;

namespace ScaleformUI.LobbyMenu
Expand Down
2 changes: 1 addition & 1 deletion ...p/LobbyMenu/Panels/MissionDetailsPanel.cs → ...s/LobbyMenu/Panels/MissionDetailsPanel.cs
View file
@@ -1,4 +1,4 @@
using System.Collections.Generic;
using ScaleformUI.Menu;

namespace ScaleformUI.LobbyMenu
{
Expand Down
0 ...harp/LobbyMenu/Panels/PlayerStatsPanel.cs → ...enus/LobbyMenu/Panels/PlayerStatsPanel.cs
View file
File renamed without changes.
25 changes: 13 additions & 12 deletions .../LobbyMenu/PlayerListColumn/FriendItem.cs → .../LobbyMenu/PlayerListColumn/FriendItem.cs
View file
@@ -1,4 +1,5 @@
using ScaleformUI.PauseMenu;
using ScaleformUI.Menu;
using ScaleformUI.PauseMenu;

namespace ScaleformUI.LobbyMenu
{
Expand Down Expand Up @@ -39,7 +40,7 @@ public string Label
label = value;
if (ParentColumn is not null && ParentColumn.Parent is not null && ParentColumn.Parent.Visible)
{
var idx = ParentColumn.Items.IndexOf(this);
int idx = ParentColumn.Items.IndexOf(this);
if (ParentColumn.Parent is MainView lobby)
lobby._pause._lobby.CallFunction("SET_PLAYER_ITEM_LABEL", idx, label);
else if (ParentColumn.Parent is TabView pause)
Expand All @@ -55,7 +56,7 @@ public HudColor ItemColor
itemColor = value;
if (ParentColumn is not null && ParentColumn.Parent is not null && ParentColumn.Parent.Visible)
{
var idx = ParentColumn.Items.IndexOf(this);
int idx = ParentColumn.Items.IndexOf(this);
if (ParentColumn.Parent is MainView lobby)
lobby._pause._lobby.CallFunction("SET_PLAYER_ITEM_COLOUR", idx, itemColor, coloredTag);
else if (ParentColumn.Parent is TabView pause)
Expand All @@ -71,7 +72,7 @@ public bool ColoredTag
coloredTag = value;
if (ParentColumn is not null && ParentColumn.Parent is not null && ParentColumn.Parent.Visible)
{
var idx = ParentColumn.Items.IndexOf(this);
int idx = ParentColumn.Items.IndexOf(this);
if (ParentColumn.Parent is MainView lobby)
lobby._pause._lobby.CallFunction("SET_PLAYER_ITEM_COLOUR", idx, itemColor, coloredTag);
else if (ParentColumn.Parent is TabView pause)
Expand All @@ -87,7 +88,7 @@ public int Rank
rank = value;
if (ParentColumn is not null && ParentColumn.Parent is not null && ParentColumn.Parent.Visible)
{
var idx = ParentColumn.Items.IndexOf(this);
int idx = ParentColumn.Items.IndexOf(this);
if (ParentColumn.Parent is MainView lobby)
lobby._pause._lobby.CallFunction("SET_PLAYER_ITEM_RANK", idx, rank);
else if (ParentColumn.Parent is TabView pause)
Expand All @@ -103,7 +104,7 @@ public string Status
status = value;
if (ParentColumn is not null && ParentColumn.Parent is not null && ParentColumn.Parent.Visible)
{
var idx = ParentColumn.Items.IndexOf(this);
int idx = ParentColumn.Items.IndexOf(this);
if (ParentColumn.Parent is MainView lobby)
lobby._pause._lobby.CallFunction("SET_PLAYER_ITEM_STATUS", idx, status, (int)statusColor);
else if (ParentColumn.Parent is TabView pause)
Expand All @@ -119,7 +120,7 @@ public HudColor StatusColor
statusColor = value;
if (ParentColumn is not null && ParentColumn.Parent is not null && ParentColumn.Parent.Visible)
{
var idx = ParentColumn.Items.IndexOf(this);
int idx = ParentColumn.Items.IndexOf(this);
if (ParentColumn.Parent is MainView lobby)
lobby._pause._lobby.CallFunction("SET_PLAYER_ITEM_STATUS", idx, status, (int)statusColor);
else if (ParentColumn.Parent is TabView pause)
Expand All @@ -135,7 +136,7 @@ public string CrewTag
crewTag = value;
if (ParentColumn is not null && ParentColumn.Parent is not null && ParentColumn.Parent.Visible)
{
var idx = ParentColumn.Items.IndexOf(this);
int idx = ParentColumn.Items.IndexOf(this);
if (ParentColumn.Parent is MainView lobby)
lobby._pause._lobby.CallFunction("SET_PLAYER_ITEM_CREW", idx, crewTag);
else if (ParentColumn.Parent is TabView pause)
Expand Down Expand Up @@ -167,7 +168,7 @@ public void SetLeftIcon(LobbyBadgeIcon icon)
boolL = false;
if (ParentColumn is not null && ParentColumn.Parent is not null && ParentColumn.Parent.Visible)
{
var idx = ParentColumn.Items.IndexOf(this);
int idx = ParentColumn.Items.IndexOf(this);
if (ParentColumn.Parent is MainView lobby)
lobby._pause._lobby.CallFunction("SET_PLAYER_ITEM_ICON_LEFT", idx, iconL, boolL);
else if (ParentColumn.Parent is TabView pause)
Expand All @@ -180,7 +181,7 @@ public void SetLeftIcon(BadgeIcon icon)
boolL = true;
if (ParentColumn is not null && ParentColumn.Parent is not null && ParentColumn.Parent.Visible)
{
var idx = ParentColumn.Items.IndexOf(this);
int idx = ParentColumn.Items.IndexOf(this);
if (ParentColumn.Parent is MainView lobby)
lobby._pause._lobby.CallFunction("SET_PLAYER_ITEM_ICON_LEFT", idx, iconL, boolL);
else if (ParentColumn.Parent is TabView pause)
Expand All @@ -194,7 +195,7 @@ public void SetRightIcon(LobbyBadgeIcon icon)
boolR = false;
if (ParentColumn is not null && ParentColumn.Parent is not null && ParentColumn.Parent.Visible)
{
var idx = ParentColumn.Items.IndexOf(this);
int idx = ParentColumn.Items.IndexOf(this);
if (ParentColumn.Parent is MainView lobby)
lobby._pause._lobby.CallFunction("SET_PLAYER_ITEM_ICON_RIGHT", idx, iconR, boolR);
else if (ParentColumn.Parent is TabView pause)
Expand All @@ -207,7 +208,7 @@ public void SetRightIcon(BadgeIcon icon)
boolR = true;
if (ParentColumn is not null && ParentColumn.Parent is not null && ParentColumn.Parent.Visible)
{
var idx = ParentColumn.Items.IndexOf(this);
int idx = ParentColumn.Items.IndexOf(this);
if (ParentColumn.Parent is MainView lobby)
lobby._pause._lobby.CallFunction("SET_PLAYER_ITEM_ICON_RIGHT", idx, iconR, boolR);
else if (ParentColumn.Parent is TabView pause)
Expand Down
0 ...obbyMenu/PlayerListColumn/MMPLayerItem.cs → ...obbyMenu/PlayerListColumn/MMPLayerItem.cs
View file
File renamed without changes.
4 changes: 3 additions & 1 deletion ...UI_Csharp/PauseMenu/Items/BasicTabItem.cs → ...use Menus/PauseMenu/Items/BasicTabItem.cs
View file
@@ -1,4 +1,6 @@
namespace ScaleformUI.PauseMenu
using ScaleformUI.Elements;

namespace ScaleformUI.PauseMenu
{
public class BasicTabItem
{
Expand Down
0 ...rmUI_Csharp/PauseMenu/Items/KeymapItem.cs → ...Pause Menus/PauseMenu/Items/KeymapItem.cs
View file
File renamed without changes.
4 changes: 3 additions & 1 deletion ...ems/SettingsItems/SettingsCheckboxItem.cs → ...ems/SettingsItems/SettingsCheckboxItem.cs
View file
@@ -1,4 +1,6 @@
namespace ScaleformUI.PauseMenu
using ScaleformUI.Menu;

namespace ScaleformUI.PauseMenu
{
public delegate void SettingsCheckboxChanged(SettingsItem item, bool value);
public class SettingsCheckboxItem : SettingsItem
Expand Down
0 ...eMenu/Items/SettingsItems/SettingsItem.cs → ...eMenu/Items/SettingsItems/SettingsItem.cs
View file
File renamed without changes.
0 ...u/Items/SettingsItems/SettingsListItem.cs → ...u/Items/SettingsItems/SettingsListItem.cs
View file
File renamed without changes.
0 ...ems/SettingsItems/SettingsProgressItem.cs → ...ems/SettingsItems/SettingsProgressItem.cs
View file
File renamed without changes.
0 ...Items/SettingsItems/SettingsSliderItem.cs → ...Items/SettingsItems/SettingsSliderItem.cs
View file
File renamed without changes.
4 changes: 3 additions & 1 deletion ...UI_Csharp/PauseMenu/Items/StatsTabItem.cs → ...use Menus/PauseMenu/Items/StatsTabItem.cs
View file
@@ -1,4 +1,6 @@
namespace ScaleformUI.PauseMenu
using ScaleformUI.Elements;

namespace ScaleformUI.PauseMenu
{
public enum StatItemType
{
Expand Down
2 changes: 2 additions & 0 deletions ScaleformUI_Csharp/PauseMenu/TabView.cs → ...rp/Menus/Pause Menus/PauseMenu/TabView.cs
View file
@@ -1,5 +1,7 @@
using CitizenFX.Core;
using ScaleformUI.LobbyMenu;
using ScaleformUI.Menu;
using ScaleformUI.PauseMenus;
using static CitizenFX.Core.Native.API;

namespace ScaleformUI.PauseMenu
Expand Down
0 ScaleformUI_Csharp/PauseMenu/Tabs/BaseTab.cs → ...nus/Pause Menus/PauseMenu/Tabs/BaseTab.cs
View file
File renamed without changes.
0 ...UI_Csharp/PauseMenu/Tabs/PlayerListTab.cs → ...use Menus/PauseMenu/Tabs/PlayerListTab.cs
View file
File renamed without changes.
0 ...ormUI_Csharp/PauseMenu/Tabs/SubmenuTab.cs → .../Pause Menus/PauseMenu/Tabs/SubmenuTab.cs
View file
File renamed without changes.
5 changes: 4 additions & 1 deletion ...rmUI_Csharp/PauseMenu/Tabs/TabLeftItem.cs → ...Pause Menus/PauseMenu/Tabs/TabLeftItem.cs
View file
@@ -1,4 +1,7 @@
namespace ScaleformUI.PauseMenu
using ScaleformUI.Elements;
using ScaleformUI.Menu;

namespace ScaleformUI.PauseMenu
{
public enum LeftItemType
{
Expand Down
0 ScaleformUI_Csharp/PauseMenu/Tabs/TextTab.cs → ...nus/Pause Menus/PauseMenu/Tabs/TextTab.cs
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ScaleformUI_Csharp/PauseMenuBase.cs → ...Csharp/Menus/Pause Menus/PauseMenuBase.cs
View file
@@ -1,6 +1,6 @@
using CitizenFX.Core.Native;

namespace ScaleformUI
namespace ScaleformUI.PauseMenus
{
public class PauseMenuBase
{
Expand Down
10 changes: 5 additions & 5 deletions ScaleformUI_Csharp/BreadcrumbsHandler.cs → ...Csharp/Menus/UIMenu/BreadcrumbsHandler.cs
View file
@@ -1,16 +1,16 @@
namespace ScaleformUI
namespace ScaleformUI.Menu
{
internal static class BreadcrumbsHandler
{
private static readonly List<UIMenu> breadcrumbs = new List<UIMenu>();
private static readonly List<Tuple<UIMenu, dynamic>> breadcrumbs = new List<Tuple<UIMenu, dynamic>>();
internal static int Count => breadcrumbs.Count;
internal static int CurrentDepth => breadcrumbs.Count - 1;
internal static UIMenu PreviousMenu => breadcrumbs[CurrentDepth - 1];
internal static UIMenu PreviousMenu => breadcrumbs[CurrentDepth - 1].Item1;
public static bool SwitchInProgress = false;

internal static void Forward(UIMenu menu)
internal static void Forward(UIMenu menu, dynamic data)
{
breadcrumbs.Add(menu);
breadcrumbs.Add(new Tuple<UIMenu, dynamic>(menu, data));
}

internal static void Clear()
Expand Down
2 changes: 1 addition & 1 deletion ScaleformUI_Csharp/Items/IListItem.cs → ...UI_Csharp/Menus/UIMenu/Items/IListItem.cs
View file
@@ -1,4 +1,4 @@
namespace ScaleformUI
namespace ScaleformUI.Menu
{
public interface IListItem
{
Expand Down
2 changes: 1 addition & 1 deletion ...formUI_Csharp/Items/UIMenuCheckboxItem.cs → .../Menus/UIMenu/Items/UIMenuCheckboxItem.cs
View file
@@ -1,4 +1,4 @@
namespace ScaleformUI
namespace ScaleformUI.Menu
{
public enum UIMenuCheckboxStyle
{
Expand Down
2 changes: 1 addition & 1 deletion ...mUI_Csharp/Items/UIMenuDynamicListItem.cs → ...nus/UIMenu/Items/UIMenuDynamicListItem.cs
View file
@@ -1,4 +1,4 @@
namespace ScaleformUI
namespace ScaleformUI.Menu
{
public class UIMenuDynamicListItem : UIMenuItem, IListItem
{
Expand Down
3 changes: 2 additions & 1 deletion ScaleformUI_Csharp/Items/UIMenuItem.cs → ...I_Csharp/Menus/UIMenu/Items/UIMenuItem.cs
View file
@@ -1,8 +1,9 @@
using CitizenFX.Core.Native;
using ScaleformUI.Elements;
using ScaleformUI.LobbyMenu;
using ScaleformUI.PauseMenu;

namespace ScaleformUI
namespace ScaleformUI.Menu
{
public enum BadgeIcon
{
Expand Down

0 comments on commit 8ada9ee

Please sign in to comment.