Remove reflection and cleanup names

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/BaseClasses/InputBase.cs

@@ -1,6 +1,6 @@
 using Meadow.Peripherals.Displays;
 
-namespace Meadow.Foundation.Displays.TextDisplayMenu.InputTypes
+namespace Meadow.Foundation.Displays.UI.InputTypes
 {
     /// <summary>
     /// Represents a base input menu item

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/BaseClasses/MenuItemBase.cs

@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Meadow.Foundation.Displays.TextDisplayMenu
+namespace Meadow.Foundation.Displays.UI
 {
     /// <summary>
     /// Represents a text display menu item

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/BaseClasses/NumericBase.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Meadow.Foundation.Displays.TextDisplayMenu.InputTypes
+namespace Meadow.Foundation.Displays.UI.InputTypes
 {
     /// <summary>
     /// Represents a base Numeric input type

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/BaseClasses/TimeBase.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Meadow.Foundation.Displays.TextDisplayMenu.InputTypes
+namespace Meadow.Foundation.Displays.UI.InputTypes
 {
     /// <summary>
     /// A base time input type

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/EventHandlers.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Meadow.Foundation.Displays.TextDisplayMenu
+namespace Meadow.Foundation.Displays.UI
 {
     /// <summary>
     /// Text display MenuSelectedEventArgs

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/InputTypes/Age.cs

@@ -1,4 +1,4 @@
-namespace Meadow.Foundation.Displays.TextDisplayMenu.InputTypes
+namespace Meadow.Foundation.Displays.UI.InputTypes
 {
     /// <summary>
     /// Age input type

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/InputTypes/Boolean.cs

@@ -1,4 +1,4 @@
-namespace Meadow.Foundation.Displays.TextDisplayMenu.InputTypes
+namespace Meadow.Foundation.Displays.UI.InputTypes
 {
     /// <summary>
     /// Text display menu bool input type

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/InputTypes/Date.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Meadow.Foundation.Displays.TextDisplayMenu.InputTypes
+namespace Meadow.Foundation.Displays.UI.InputTypes
 {
     /// <summary>
     /// Text display menu Date input type

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/InputTypes/InputHelpers.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace Meadow.Foundation.Displays.TextDisplayMenu.InputTypes
+namespace Meadow.Foundation.Displays.UI.InputTypes
 {
     internal static class InputHelpers
     {

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/InputTypes/InputType.cs

@@ -0,0 +1,12 @@
+internal enum InputType
+{
+    Age,
+    Boolean,
+    Date,
+    Numerical,
+    Onff,
+    Temperature,
+    Time,
+    TimeDetailed,
+    TimeShort,
+}

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/InputTypes/ListBase.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Meadow.Foundation.Displays.TextDisplayMenu.InputTypes
+namespace Meadow.Foundation.Displays.UI.InputTypes
 {
     /// <summary>
     /// Text display menu base List input type

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/InputTypes/Numerical.cs

@@ -1,4 +1,4 @@
-namespace Meadow.Foundation.Displays.TextDisplayMenu.InputTypes
+namespace Meadow.Foundation.Displays.UI.InputTypes
 {
     /// <summary>
     /// Text display menu Numerical input item

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/InputTypes/OnOff.cs

@@ -1,4 +1,4 @@
-namespace Meadow.Foundation.Displays.TextDisplayMenu.InputTypes
+namespace Meadow.Foundation.Displays.UI.InputTypes
 {
     /// <summary>
     /// Text display menu on/off input item

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/InputTypes/Temperature.cs

@@ -1,4 +1,4 @@
-namespace Meadow.Foundation.Displays.TextDisplayMenu.InputTypes
+namespace Meadow.Foundation.Displays.UI.InputTypes
 {
     /// <summary>
     /// Text display menu Temperature input item

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/InputTypes/Time.cs

@@ -1,4 +1,4 @@
-namespace Meadow.Foundation.Displays.TextDisplayMenu.InputTypes
+namespace Meadow.Foundation.Displays.UI.InputTypes
 {
     /// <summary>
     /// Text display menu Time input item

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/InputTypes/TimeDetailed.cs

@@ -1,4 +1,4 @@
-namespace Meadow.Foundation.Displays.TextDisplayMenu.InputTypes
+namespace Meadow.Foundation.Displays.UI.InputTypes
 {
     /// <summary>
     /// Text display menu TimeDetailed input item

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/InputTypes/TimeShort.cs

@@ -1,4 +1,4 @@
-namespace Meadow.Foundation.Displays.TextDisplayMenu.InputTypes
+namespace Meadow.Foundation.Displays.UI.InputTypes
 {
     /// <summary>
     /// Text display menu TimeShort input item

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/Interfaces/IMenuInputItem.cs

@@ -1,9 +1,9 @@
 using Meadow.Peripherals.Displays;
 
-namespace Meadow.Foundation.Displays.TextDisplayMenu
+namespace Meadow.Foundation.Displays.UI
 {
     /// <summary>
-    /// Text display Menu Input abstraction
+    /// Text display TextDisplayMenu Input abstraction
     /// </summary>
     public interface IMenuInputItem : IPage
     {

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/Interfaces/IPage.cs

@@ -1,4 +1,4 @@
-namespace Meadow.Foundation.Displays.TextDisplayMenu
+namespace Meadow.Foundation.Displays.UI
 {
     /// <summary>
     /// Text display menu page abstraction

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/MenuPage.cs

@@ -1,7 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
-namespace Meadow.Foundation.Displays.TextDisplayMenu
+namespace Meadow.Foundation.Displays.UI
 {
     /// <summary>
     /// Text display MenuPage class
@@ -13,8 +12,9 @@ public class MenuPage : IPage
         /// </summary>
         public int ScrollPosition
         {
-            get => scrollPosition; 
-            set {
+            get => scrollPosition;
+            set
+            {
                 if (value > MenuItems.Count - 1 || value < 0)
                 {
                     Resolver.Log.Warn("Attempting to set a scroll position outside of item range: " + value.ToString());

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/TextCharacters.cs

@@ -1,4 +1,4 @@
-namespace Meadow.Foundation.Displays.TextDisplayMenu
+namespace Meadow.Foundation.Displays.UI
 {
     /// <summary>
     /// TextCharacters class for custom characters on LCD character displays

Source/Meadow.Foundation.Libraries_and_Frameworks/Displays.TextDisplayMenu/Driver/TextDisplayMenu.cs

@@ -1,17 +1,16 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using Meadow.Foundation.Displays.TextDisplayMenu.InputTypes;
+using Meadow.Foundation.Displays.UI.InputTypes;
 using Meadow.Peripherals.Displays;
 using Newtonsoft.Json;
+using System;
+using System.Collections;
+using System.Collections.Generic;
 
-namespace Meadow.Foundation.Displays.TextDisplayMenu
+namespace Meadow.Foundation.Displays.UI
 {
     /// <summary>
-    /// TextDisplayMenu Menu class
+    /// TextDisplayMenu TextDisplayMenu class
     /// </summary>
-    public class Menu
+    public class TextDisplayMenu
     {
         const string INPUT_TYPES_NAMESPACE = "Meadow.Foundation.Displays.TextDisplayMenu.InputTypes.";
         ITextDisplay display;
@@ -46,25 +45,25 @@ public class Menu
         public bool IsEnabled { get; protected set; } = false;
 
         /// <summary>
-        /// Create a new Menu object
+        /// Create a new TextDisplayMenu object
         /// </summary>
         /// <param name="display">The display to render the menu</param>
         /// <param name="menuJson">Json to define the menu structure</param>
         /// <param name="showBackOnRoot">True to show Back item on root menu</param>
-        public Menu(ITextDisplay display, byte[] menuJson, bool showBackOnRoot = false)
+        public TextDisplayMenu(ITextDisplay display, byte[] menuJson, bool showBackOnRoot = false)
         {
             this.showBackOnRoot = showBackOnRoot;
             var items = ParseMenuData(menuJson);
             Init(display, CreateMenuPage(items, showBackOnRoot));
         }
 
         /// <summary>
-        /// Create a new Menu object
+        /// Create a new TextDisplayMenu object
         /// </summary>
         /// <param name="display">The display to render the menu</param>
-        /// <param name="menuItems">Menu items array</param>
+        /// <param name="menuItems">TextDisplayMenu items array</param>
         /// <param name="showBackOnRoot">True to show Back item on root menu</param>
-        public Menu(ITextDisplay display, MenuItem[] menuItems, bool showBackOnRoot = false)
+        public TextDisplayMenu(ITextDisplay display, MenuItem[] menuItems, bool showBackOnRoot = false)
         {
             Init(display, CreateMenuPage(menuItems, showBackOnRoot));
         }
@@ -109,7 +108,7 @@ public void Disable()
         }
 
         /// <summary>
-        /// Create a Menu page
+        /// Create a TextDisplayMenu page
         /// </summary>
         /// <param name="items">Items to populate page</param>
         /// <param name="addBack">True to add a back item</param>
@@ -126,7 +125,7 @@ protected MenuPage CreateMenuPage(MenuItem[] items, bool addBack)
             foreach (var item in items)
             {
                 menuPage.MenuItems.Add(item);
-            } 
+            }
 
             return menuPage;
         }
@@ -136,7 +135,8 @@ protected MenuPage CreateMenuPage(MenuItem[] items, bool addBack)
         /// </summary>
         protected void ShowCurrentPage()
         {
-            if (!IsEnabled) {
+            if (!IsEnabled)
+            {
                 Resolver.Log.Warn("Render not enabled");
                 return;
             }
@@ -186,7 +186,7 @@ protected void ShowCurrentPage()
         /// <returns>The item text</returns>
         protected string GetItemText(MenuItem item, bool isSelected)
         {
-            if(item == null)
+            if (item == null)
             {
                 Resolver.Log.Warn("GetItemText: item is null");
                 return "no item";
@@ -216,7 +216,7 @@ protected string GetItemText(MenuItem item, bool isSelected)
                 string padding = string.Empty;
                 if (paddingLength > 0) { padding = new string(' ', paddingLength); }
 
-                itemText += padding + (isSelected?"*":">");
+                itemText += padding + (isSelected ? "*" : ">");
             }
 
             return itemText;
@@ -228,17 +228,17 @@ protected string GetItemText(MenuItem item, bool isSelected)
         protected void UpdateCurrentMenuPage()
         {
             currentMenuPage = rootMenuPage;
-        } 
+        }
 
         /// <summary>
         /// Next input - navigates down/forward in the list of items
         /// </summary>
         /// <returns>True if successful, false in menu is disabled</returns>
         public bool Next()
         {
-            if(IsEnabled == false) { return false; }
+            if (IsEnabled == false) { return false; }
 
-            if(currentInputItem != null)
+            if (currentInputItem != null)
             {
                 currentInputItem.Next();
             }
@@ -327,7 +327,7 @@ public bool Select()
                 Exited(this, new EventArgs());
                 return true;
             }
-            
+
             // if currently on a subpage and user selects back, pop back to parent page.
             if (currentMenuPage.ScrollPosition == 0 && pageStack.Count > 0)
             {
@@ -359,19 +359,10 @@ public bool Select()
             else if (menuItem.Type != string.Empty)
             {
                 pageStack.Push(currentMenuPage);
-
-                isEditMode = true;
-
-                // create the new input type
-                var type = Type.GetType(INPUT_TYPES_NAMESPACE + menuItem.Type);
 
-                if (type == null)
-                {
-                    throw new ArgumentException(menuItem.Type + " was not found");
-                }
+                isEditMode = true;
 
-                var constructor = type.GetConstructor(new Type[] { });
-                currentInputItem = constructor.Invoke(new object[] { }) as IMenuInputItem;
+                currentInputItem = GetMenuInputItemFromName(menuItem.Type);
 
                 // setup callback
                 currentInputItem.ValueChanged += delegate (object sender, ValueChangedEventArgs e)
@@ -400,6 +391,30 @@ public bool Select()
             }
         }
 
+        enum DaysOfWeek { Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday };
+
+        IMenuInputItem GetMenuInputItemFromName(string name)
+        {
+            if (Enum.TryParse(name, out InputType inputType) == false)
+            {
+                throw new ArgumentException(name + " was not found");
+            }
+
+            return inputType switch
+            {
+                InputType.Age => new Age(),
+                InputType.Boolean => new InputTypes.Boolean(),
+                InputType.Date => new Date(),
+                InputType.Numerical => new Numerical(),
+                InputType.Onff => new OnOff(),
+                InputType.Temperature => new Temperature(),
+                InputType.Time => new Time(),
+                InputType.TimeDetailed => new TimeDetailed(),
+                InputType.TimeShort => new TimeShort(),
+                _ => null,
+            };
+        }
+
         /// <summary>
         /// Refresh / redraw the menu
         /// </summary>
@@ -441,7 +456,7 @@ private void UpdateMenuItemValue(string id, object value)
             MenuItem node = null;
             foreach (var menuItem in rootMenuPage.MenuItems)
             {
-                node = FindNodeById(menuItem as MenuItem, id);
+                node = FindNodeById(menuItem, id);
                 if (node != null) { break; }
             }
 
@@ -465,7 +480,7 @@ private MenuItem FindNodeById(MenuItem menuItem, string id)
             {
                 foreach (var subMenuItem in menuItem.SubItems)
                 {
-                    var node = FindNodeById(subMenuItem as MenuItem, id);
+                    var node = FindNodeById(subMenuItem, id);
                     if (node != null) return node;
                 }
             }