GabrielTofvesson/BankProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Started implementing ListView

Browse Source 
Started standardizing event system
This commit is contained in:
Gabriel Tofvesson 2018-04-03 23:51:06 +02:00
parent f1071b4994
commit 5aacdba782
16 changed files with 281 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Client/Client.csproj
View File

@ -46,6 +46,9 @@
<Compile Include="ConsoleForms\ConsoleController.cs" />
<Compile Include="ConsoleForms\Context.cs" />
<Compile Include="ConsoleForms\ContextManager.cs" />
<Compile Include="ConsoleForms\Events\ISubmissionListener.cs" />
<Compile Include="ConsoleForms\Events\ITextInputEventListener.cs" />
<Compile Include="ConsoleForms\Graphics\ButtonView.cs" />
<Compile Include="ConsoleForms\Graphics\DialogView.cs" />
<Compile Include="ConsoleForms\Graphics\InputView.cs" />
<Compile Include="ConsoleForms\LayoutMeta.cs" />

30
Client/ConsoleForms/ConsoleController.cs
View File

@ -253,28 +253,28 @@ namespace Client.ConsoleForms
List<Tuple<string, View>> views = new List<Tuple<string, View>>();
foreach (var child in doc.FirstChild.NextSibling.ChildNodes)
{
if (!(child is XmlNode) || child is XmlComment) continue;
ViewData data = DoElementParse((XmlNode)child);
View load;
Type type;
try { type = Type.GetType(ns + '.' + data.Name, true); }
catch { type = Type.GetType(data.Name, true); }
ConstructorInfo info = type.GetConstructor(new Type[] { typeof(ViewData) });
string id = data.attributes.ContainsKey("id") ? data.attributes["id"] : "";
load = (View)info.Invoke(new object[] { data });
views.Add(new Tuple<string, View>(id, load));
}
else views.Add(LoadView(ns, DoElementParse((XmlNode)child)));
if (cacheID != null) cache[cacheID] = views;
return views;
}
public static Tuple<string, View> LoadView(string ns, ViewData data)
{
Type type;
try { type = Type.GetType(ns + '.' + data.Name, true); }
catch { type = Type.GetType(data.Name, true); }
ConstructorInfo info = type.GetConstructor(new Type[] { typeof(ViewData) });
string id = data.attributes.ContainsKey("id") ? data.attributes["id"] : "";
data.attributes["xmlns"] = ns;
return new Tuple<string, View>(id, (View)info.Invoke(new object[] { data }));
}
public delegate void Runnable();
public void Popup(string message, long timeout, ConsoleColor borderColor = ConsoleColor.Blue, Runnable onExpire = null)
{

15
Client/ConsoleForms/Events/ISubmissionListener.cs Normal file
View File

@ -0,0 +1,15 @@
using Client.ConsoleForms.Graphics;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Client.ConsoleForms.Events
{
public delegate void SubmissionEvent(View listener);
public interface ISubmissionListener
{
void SetEvent(SubmissionEvent listener);
}
}

15
Client/ConsoleForms/Events/ITextInputEventListener.cs Normal file
View File

@ -0,0 +1,15 @@
using Client.ConsoleForms.Graphics;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Client.ConsoleForms.Events
{
public delegate void TextInputEvent(ConsoleKeyInfo info, View listener);
public interface ITextInputEventListener
{
void SetEvent(TextInputEvent listener);
}
}

26
Client/ConsoleForms/Graphics/ButtonView.cs Normal file
View File

@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Client.ConsoleForms.Parameters;
using Client.ConsoleForms.Events;
namespace Client.ConsoleForms.Graphics
{
public class ButtonView : TextView, ISubmissionListener
{
protected SubmissionEvent evt;
public ButtonView(ViewData parameters) : base(parameters)
{
}
public override bool HandleKeyEvent(ConsoleController.KeyEvent info, bool inFocus)
{
return base.HandleKeyEvent(info, inFocus);
}
public void SetEvent(SubmissionEvent listener) => evt = listener;
}
}

2
Client/ConsoleForms/Graphics/DialogView.cs
View File

@ -45,7 +45,7 @@ namespace Client.ConsoleForms.Graphics
NotSelectColor = (ConsoleColor)parameters.AttribueAsInt("unselect_color", (int)ConsoleColor.White);
}
protected override void _Draw(int left, int top)
protected override void _Draw(int left, ref int top)
{
DrawEmptyPadding(left, ref top, padding.Top());
base.DrawContent(left, ref top);

2
Client/ConsoleForms/Graphics/InputView.cs
View File

@ -159,7 +159,7 @@ namespace Client.ConsoleForms.Graphics
ContentHeight += computedSize + Inputs.Length * 2;
}
protected override void _Draw(int left, int top)
protected override void _Draw(int left, ref int top)
{
DrawEmptyPadding(left, ref top, padding.Top());
DrawContent(left, ref top);

99
Client/ConsoleForms/Graphics/ListView.cs
View File

@ -1,26 +1,113 @@
using Client.ConsoleForms.Parameters;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Client.ConsoleForms.Graphics
{
public class ListView : View
{
protected readonly List<Tuple<string, View>> innerViews = new List<Tuple<string, View>>();
public int SelectedView { get; set; }
public int ViewCount { get => innerViews.Count; }
public ConsoleColor SelectBackground { get; set; }
public ConsoleColor SelectText { get; set; }
public override Region Occlusion => new Region(new Rectangle(0, 0, ContentWidth, ContentHeight));
public ListView(ViewData parameters) : base(parameters)
{
SelectBackground = (ConsoleColor)parameters.AttribueAsInt("background_select_color", (int)ConsoleColor.Gray);
SelectText = (ConsoleColor)parameters.AttribueAsInt("text_select_color", (int)ConsoleColor.Gray);
int maxWidth = parameters.AttribueAsInt("width", -1);
bool limited = maxWidth != -1;
foreach (var view in parameters.nestedData.FirstOrNull(n => n.Name.Equals("Views"))?.nestedData ?? new List<ViewData>())
{
// Limit content width
if (limited && view.AttribueAsInt("width") > maxWidth) view.attributes["width"] = maxWidth.ToString();
Tuple<string, View> v = ConsoleController.LoadView(parameters.attributes["xmlns"], view); // Load the view in with standard namespace
innerViews.Add(v);
if (!limited) maxWidth = Math.Max(v.Item2.ContentWidth, maxWidth);
ContentHeight += v.Item2.ContentHeight + 1;
}
++ContentHeight;
SelectedView = 0;
ContentWidth = maxWidth;
}
public override Region Occlusion => throw new NotImplementedException();
public View GetView(string name) => innerViews.FirstOrNull(v => v.Item1.Equals(name))?.Item2;
protected override void _Draw(int left, int top)
protected override void _Draw(int left, ref int top)
{
throw new NotImplementedException();
foreach(var view in innerViews)
{
DrawBlankLine(left, ref top);
ConsoleColor
bgHold = view.Item2.BackgroundColor,
fgHold = view.Item2.TextColor;
if(view == innerViews[SelectedView])
{
view.Item2.BackgroundColor = SelectBackground;
view.Item2.TextColor = SelectText;
}
DrawView(left, ref top, view.Item2);
if (view == innerViews[SelectedView])
{
view.Item2.BackgroundColor = bgHold;
view.Item2.TextColor = fgHold;
}
}
DrawBlankLine(left, ref top);
}
protected virtual void DrawView(int left, ref int top, View v) => v.Draw(left, ref top);
protected virtual void DrawBlankLine(int left, ref int top)
{
ResetRenderColors();
Console.SetCursorPosition(left, top++);
Console.Write(Filler(' ', ContentWidth));
}
public override bool HandleKeyEvent(ConsoleController.KeyEvent info, bool inFocus)
{
if (!inFocus) return false;
if (innerViews[SelectedView].Item2.HandleKeyEvent(info, inFocus)) return true;
else if (!info.ValidEvent) return false;
// Handle navigation
switch (info.Event.Key)
{
case ConsoleKey.UpArrow:
if (SelectedView > 0)
{
info.ValidEvent = false;
--SelectedView;
return true;
}
break;
case ConsoleKey.DownArrow:
if(SelectedView < innerViews.Count - 1)
{
info.ValidEvent = false;
++SelectedView;
return true;
}
break;
}
return base.HandleKeyEvent(info, inFocus);
}
}
}

6
Client/ConsoleForms/Graphics/TextView.cs
View File

@ -40,14 +40,10 @@ namespace Client.ConsoleForms.Graphics
//public char Border { get; set; }
//public ConsoleColor BorderColor { get; set; }
public ConsoleColor BackgroundColor { get; set; }
public ConsoleColor TextColor { get; set; }
public TextView(ViewData parameters) : base(parameters)
{
//BorderColor = (ConsoleColor) parameters.AttribueAsInt("border", (int)ConsoleColor.Blue);
BackgroundColor = (ConsoleColor)parameters.AttribueAsInt("color_background", (int)ConsoleColor.White);
TextColor = (ConsoleColor)parameters.AttribueAsInt("color_text", (int)ConsoleColor.Black);
Border = ' ';
this.text = parameters.NestedText("Text").Split(' ');
@ -151,7 +147,7 @@ namespace Client.ConsoleForms.Graphics
private static bool WillSubSplit(string s, int max) => ((s.Length / max) + (s.Length % max != 0 ? 1 : 0)) > 1 || s.Contains('\n');
protected override void _Draw(int left, int top)
protected override void _Draw(int left, ref int top)
{
DrawEmptyPadding(left, ref top, padding.Top());
DrawContent(left, ref top);

36
Client/ConsoleForms/Graphics/View.cs
View File

@ -23,6 +23,8 @@ namespace Client.ConsoleForms.Graphics
public char Border { get; set; }
public bool DrawBorder { get; set; }
public ConsoleColor BorderColor { get; set; }
public ConsoleColor BackgroundColor { get; set; }
public ConsoleColor TextColor { get; set; }
public int ContentWidth { get; protected set; }
public int ContentHeight { get; protected set; }
public abstract Region Occlusion { get; }
@ -30,10 +32,12 @@ namespace Client.ConsoleForms.Graphics
public View(ViewData parameters)
{
this.padding = new AbsolutePadding(parameters.AttribueAsInt("padding_left"), parameters.AttribueAsInt("padding_right"), parameters.AttribueAsInt("padding_top"), parameters.AttribueAsInt("padding_bottom"));
this.gravity = (Gravity)parameters.AttribueAsInt("gravity");
this.BorderColor = (ConsoleColor)parameters.AttribueAsInt("border", (int)ConsoleColor.Blue);
this.Border = ' ';
padding = new AbsolutePadding(parameters.AttribueAsInt("padding_left"), parameters.AttribueAsInt("padding_right"), parameters.AttribueAsInt("padding_top"), parameters.AttribueAsInt("padding_bottom"));
gravity = (Gravity)parameters.AttribueAsInt("gravity");
BorderColor = (ConsoleColor)parameters.AttribueAsInt("border", (int)ConsoleColor.Blue);
BackgroundColor = (ConsoleColor)parameters.AttribueAsInt("color_background", (int)ConsoleColor.White);
TextColor = (ConsoleColor)parameters.AttribueAsInt("color_text", (int)ConsoleColor.Black);
Border = ' ';
DrawBorder = parameters.attributes.ContainsKey("border");
back_data = parameters.GetAttribute("back");
@ -44,12 +48,20 @@ namespace Client.ConsoleForms.Graphics
hCenter = !Enums.HasFlag(gravity, Gravity.TOP) && !Enums.HasFlag(gravity, Gravity.BOTTOM);
}
public void ResetRenderColors() => SetRenderColors(BackgroundColor, TextColor);
public void SetRenderColors(ConsoleColor bg, ConsoleColor fg)
{
Console.BackgroundColor = bg;
Console.ForegroundColor = fg;
}
public void Draw(Tuple<int, int> t) => Draw(t.Item1, t.Item2);
public void Draw(int left, int top)
public void Draw(int left, int top) => Draw(left, ref top);
public void Draw(int left, ref int top)
{
Dirty = false;
if (DrawBorder) _DrawBorder(left, top);
_Draw(left + 1, top);
_Draw(left + 1, ref top);
}
public virtual void _DrawBorder(int left, int top)
{
@ -67,7 +79,7 @@ namespace Client.ConsoleForms.Graphics
Console.Write(Filler(Border, ContentWidth + 2));
Console.BackgroundColor = ConsoleColor.Black;
}
protected abstract void _Draw(int left, int top);
protected abstract void _Draw(int left, ref int top);
public virtual bool HandleKeyEvent(ConsoleController.KeyEvent info, bool inFocus)
{
if (back_data.Length != 0 && info.ValidEvent && inFocus && info.Event.Key == ConsoleKey.Escape)
@ -77,6 +89,16 @@ namespace Client.ConsoleForms.Graphics
}
return false;
}
protected void DrawTopPadding(int left, ref int top) => DrawPadding(left, ref top, padding.Top());
protected void DrawBottomPadding(int left, ref int top) => DrawPadding(left, ref top, padding.Bottom());
private void DrawPadding(int left, ref int top, int count)
{
for (int i = 0; i < count; ++i)
{
Console.SetCursorPosition(left, top++);
Console.Write(Filler(' ', ContentWidth));
}
}
protected EventAction ParseAction(ViewData data)
{
bool.TryParse(data.GetAttribute("close"), out bool close);

27
Client/ConsoleForms/Helpers.cs
View File

@ -1,5 +1,6 @@
using Client.ConsoleForms.Parameters;
using System;
using System.Collections.Generic;
using System.Diagnostics;
namespace Client.ConsoleForms
@ -37,6 +38,32 @@ namespace Client.ConsoleForms
len += val?.InnerText.Length ?? 0;
return len;
}
public static List<T> Collect<T>(this IEnumerable<T> l, Predicate<T> p, List<T> collector = null)
{
List<T> res = collector ?? new List<T>();
foreach (var t in l)
if (p(t))
res.Add(t);
return res;
}
public static int Matches<T>(this IEnumerable<T> l, Predicate<T> p)
{
int i = 0;
foreach (var t in l)
if (p(t))
++i;
return i;
}
public static T FirstOrNull<T>(this IEnumerable<T> l, Predicate<T> p)
{
foreach (var t in l)
if (p(t))
return t;
return default(T);
}
}

18
Client/Context/WelcomeContext.cs
View File

@ -32,14 +32,13 @@ namespace Client
bool success = true;
foreach (var input in i.Inputs)
{
if (input.Text.Length == 0)
{
success = false;
input.SelectBackgroundColor = ConsoleColor.Red;
input.BackgroundColor = ConsoleColor.DarkRed;
}
}
if (success)
{
@ -142,8 +141,21 @@ namespace Client
public override void OnDestroy()
{
// TODO: Save state
((InputView)views.GetNamed("Register")).SelectedField = 0;
foreach (var v in ((InputView)views.GetNamed("Register")).Inputs)
{
v.Text = "";
v.SelectIndex = 0;
v.RenderStart = 0;
}
((InputView)views.GetNamed("Login")).SelectedField = 0;
foreach (var v in ((InputView)views.GetNamed("Login")).Inputs)
{
v.Text = "";
v.SelectIndex = 0;
v.RenderStart = 0;
}
// Close views
foreach (var view in views)

30
Client/Layout/Networking.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<Elements xmlns="ConsoleForms">
<Elements xmlns="Client.ConsoleForms.Graphics">
<!-- Networking context -->
<InputTextBox id="NetConnect"
<InputView id="NetConnect"
padding_left="2"
padding_right="2"
padding_top="1"
@ -11,9 +11,9 @@
<Field default="80" input_type="integer" max_length="5">Port:</Field>
</Fields>
<Text>Server connection configuration</Text>
</InputTextBox>
</InputView>
<DialogBox id="SecurityIssue"
<DialogView id="SecurityIssue"
padding_left="2"
padding_right="2"
padding_top="1"
@ -24,9 +24,9 @@
<Option>Cancel</Option>
</Options>
<Text>The identity of the server could not be verified. Continue?</Text>
</DialogBox>
</DialogView>
<DialogBox id="Connecting"
<DialogView id="Connecting"
padding_left="2"
padding_right="2"
padding_top="1"
@ -35,10 +35,10 @@
<Option>Cancel</Option>
</Options>
<Text>Connecting to server...</Text>
</DialogBox>
</DialogView>
<!-- Generic dialog boxes -->
<DialogBox id="EmptyFieldError"
<DialogView id="EmptyFieldError"
padding_left="2"
padding_right="2"
padding_top="1"
@ -47,9 +47,9 @@
<Option>Ok</Option>
</Options>
<Text>One or more required input field is empty</Text>
</DialogBox>
</DialogView>
<DialogBox id="IPError"
<DialogView id="IPError"
padding_left="2"
padding_right="2"
padding_top="1"
@ -58,9 +58,9 @@
<Option>Ok</Option>
</Options>
<Text>The supplied IP-address is not valid</Text>
</DialogBox>
</DialogView>
<DialogBox id="PortError"
<DialogView id="PortError"
padding_left="2"
padding_right="2"
padding_top="1"
@ -69,9 +69,9 @@
<Option>Ok</Option>
</Options>
<Text>The supplied port is not valid</Text>
</DialogBox>
</DialogView>
<DialogBox id="ConnectionError"
<DialogView id="ConnectionError"
padding_left="2"
padding_right="2"
padding_top="1"
@ -81,5 +81,5 @@
<Option>Ok</Option>
</Options>
<Text>Could not connect to server</Text>
</DialogBox>
</DialogView>
</Elements>

6
Client/Layout/Session.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<Elements xmlns="ConsoleForms">
<DialogBox id="Success"
<Elements xmlns="Client.ConsoleForms.Graphics">
<DialogView id="Success"
padding_left="2"
padding_right="2"
padding_top="1"
@ -9,5 +9,5 @@
<Option>Quit</Option>
</Options>
<Text>Login succeeded!</Text>
</DialogBox>
</DialogView>
</Elements>

42
Client/Layout/Setup.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<Elements xmlns="ConsoleForms">
<Elements xmlns="Client.ConsoleForms.Graphics">
<!-- Welcome screen -->
<DialogBox id="WelcomeScreen"
<DialogView id="WelcomeScreen"
padding_left="2"
padding_right="2"
padding_top="1"
@ -13,10 +13,10 @@
<Option event="Setup:Register" close="true">Register</Option>
</Options>
<Text>Welcome to the Tofvesson banking system! To continue, press [ENTER] To go back, press [ESCAPE]</Text>
</DialogBox>
</DialogView>
<!-- Register-context views -->
<InputTextBox id="Register"
<InputView id="Register"
padding_left="2"
padding_right="2"
padding_top="1"
@ -29,18 +29,18 @@
<Field hide="true">Repeat password:</Field>
</Fields>
<Text>Register Account</Text>
</InputTextBox>
</InputView>
<TextBox id="RegWait"
<TextView id="RegWait"
padding_left="2"
padding_right="2"
padding_top="1"
padding_bottom="1"
border="3">
<Text>Registering...</Text>
</TextBox>
</TextView>
<DialogBox id="DuplicateAccountError"
<DialogView id="DuplicateAccountError"
padding_left="2"
padding_right="2"
padding_top="1"
@ -50,9 +50,9 @@
<Option>Ok</Option>
</Options>
<Text>An account with this username already exists!</Text>
</DialogBox>
</DialogView>
<DialogBox id="PasswordMismatchError"
<DialogView id="PasswordMismatchError"
padding_left="2"
padding_right="2"
padding_top="1"
@ -62,9 +62,9 @@
<Option>Ok</Option>
</Options>
<Text>The entered passwords don't match! </Text>
</DialogBox>
</DialogView>
<DialogBox id="WeakPasswordWarning"
<DialogView id="WeakPasswordWarning"
padding_left="2"
padding_right="2"
padding_top="1"
@ -75,10 +75,10 @@
<Option>No</Option>
</Options>
<Text>The password you have supplied has been deemed to be weak. Are you sure you want to continue?</Text>
</DialogBox>
</DialogView>
<!-- Login-context views -->
<InputTextBox id="Login"
<InputView id="Login"
padding_left="2"
padding_right="2"
padding_top="1"
@ -90,19 +90,19 @@
<Field hide="true">Password:</Field>
</Fields>
<Text>Log in</Text>
</InputTextBox>
</InputView>
<TextBox id="AuthWait"
<TextView id="AuthWait"
padding_left="2"
padding_right="2"
padding_top="1"
padding_bottom="1"
border="3">
<Text>Authenticating...</Text>
</TextBox>
</TextView>
<!-- Generic dialog boxes -->
<DialogBox id="EmptyFieldError"
<DialogView id="EmptyFieldError"
padding_left="2"
padding_right="2"
padding_top="1"
@ -112,9 +112,9 @@
<Option>Ok</Option>
</Options>
<Text>One or more required input field is empty</Text>
</DialogBox>
</DialogView>
<DialogBox id="AuthError"
<DialogView id="AuthError"
padding_left="2"
padding_right="2"
padding_top="1"
@ -124,5 +124,5 @@
<Option>Ok</Option>
</Options>
<Text>The given username or password was incorrect</Text>
</DialogBox>
</DialogView>
</Elements>

9
Client/Program.cs
View File

@ -1,17 +1,10 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
using Client;
using Client.ConsoleForms;
using Client.ConsoleForms.Parameters;
using Client.Properties;
using Common;
using Tofvesson.Collections;
namespace ConsoleForms
{
@ -61,4 +54,4 @@ namespace ConsoleForms
[DllImport("msvcrt")]
public static extern int _kbhit();
}
}
}