From 376ba68e8e7ef8809636ad0f7782b84b303cc4d2 Mon Sep 17 00:00:00 2001 From: FlorianDahn Date: Fri, 15 Jan 2021 19:33:44 +0100 Subject: [PATCH] MAJOR CHANGE: Refactoring namespace for controls Chaning namespace for controls depending on their use area to: Controls.Hybrid Controls.Inline Controls.Reply Updating example project as well. --- TelegramBotBase/Controls/{ => Hybrid}/ButtonGrid.cs | 2 +- .../Controls/{ => Inline}/CalendarPicker.cs | 2 +- .../Controls/{ => Inline}/MonthPicker.cs | 2 +- .../Controls/{ => Inline}/ProgressBar.cs | 2 +- .../Controls/{ => Inline}/ToggleButton.cs | 2 +- TelegramBotBase/Controls/{ => Inline}/TreeView.cs | 2 +- .../Controls/{ => Inline}/TreeViewNode.cs | 2 +- TelegramBotBaseTest/TelegramBotBaseTest.csproj | 2 +- .../Tests/Controls/ButtonGridForm.cs | 1 + .../Tests/Controls/ButtonGridPagingForm.cs | 1 + .../Tests/Controls/CalendarPickerForm.cs | 1 + .../Tests/Controls/MonthPickerForm.cs | 1 + TelegramBotBaseTest/Tests/Controls/ToggleButtons.cs | 1 + TelegramBotBaseTest/Tests/Controls/TreeViewForms.cs | 1 + TelegramBotBaseTest/Tests/ProgressTest.cs | 13 +++++++------ TelegramBotBaseTest/Tests/TestForm.cs | 1 - TelegramBotBaseTest/Tests/TestForm2.cs | 4 ++-- 17 files changed, 23 insertions(+), 17 deletions(-) rename TelegramBotBase/Controls/{ => Hybrid}/ButtonGrid.cs (99%) rename TelegramBotBase/Controls/{ => Inline}/CalendarPicker.cs (99%) rename TelegramBotBase/Controls/{ => Inline}/MonthPicker.cs (91%) rename TelegramBotBase/Controls/{ => Inline}/ProgressBar.cs (99%) rename TelegramBotBase/Controls/{ => Inline}/ToggleButton.cs (98%) rename TelegramBotBase/Controls/{ => Inline}/TreeView.cs (98%) rename TelegramBotBase/Controls/{ => Inline}/TreeViewNode.cs (97%) diff --git a/TelegramBotBase/Controls/ButtonGrid.cs b/TelegramBotBase/Controls/Hybrid/ButtonGrid.cs similarity index 99% rename from TelegramBotBase/Controls/ButtonGrid.cs rename to TelegramBotBase/Controls/Hybrid/ButtonGrid.cs index d341cf4..2cae964 100644 --- a/TelegramBotBase/Controls/ButtonGrid.cs +++ b/TelegramBotBase/Controls/Hybrid/ButtonGrid.cs @@ -15,7 +15,7 @@ using TelegramBotBase.Exceptions; using TelegramBotBase.Form; using static TelegramBotBase.Base.Async; -namespace TelegramBotBase.Controls +namespace TelegramBotBase.Controls.Hybrid { public class ButtonGrid : Base.ControlBase { diff --git a/TelegramBotBase/Controls/CalendarPicker.cs b/TelegramBotBase/Controls/Inline/CalendarPicker.cs similarity index 99% rename from TelegramBotBase/Controls/CalendarPicker.cs rename to TelegramBotBase/Controls/Inline/CalendarPicker.cs index f97e3ab..363b409 100644 --- a/TelegramBotBase/Controls/CalendarPicker.cs +++ b/TelegramBotBase/Controls/Inline/CalendarPicker.cs @@ -11,7 +11,7 @@ using TelegramBotBase.Form; using static TelegramBotBase.Tools.Arrays; using static TelegramBotBase.Tools.Time; -namespace TelegramBotBase.Controls +namespace TelegramBotBase.Controls.Inline { public class CalendarPicker : Base.ControlBase { diff --git a/TelegramBotBase/Controls/MonthPicker.cs b/TelegramBotBase/Controls/Inline/MonthPicker.cs similarity index 91% rename from TelegramBotBase/Controls/MonthPicker.cs rename to TelegramBotBase/Controls/Inline/MonthPicker.cs index 93bf715..78c6fc2 100644 --- a/TelegramBotBase/Controls/MonthPicker.cs +++ b/TelegramBotBase/Controls/Inline/MonthPicker.cs @@ -8,7 +8,7 @@ using TelegramBotBase.Base; using TelegramBotBase.Enums; using TelegramBotBase.Form; -namespace TelegramBotBase.Controls +namespace TelegramBotBase.Controls.Inline { public class MonthPicker : CalendarPicker { diff --git a/TelegramBotBase/Controls/ProgressBar.cs b/TelegramBotBase/Controls/Inline/ProgressBar.cs similarity index 99% rename from TelegramBotBase/Controls/ProgressBar.cs rename to TelegramBotBase/Controls/Inline/ProgressBar.cs index 36f91c3..14dd585 100644 --- a/TelegramBotBase/Controls/ProgressBar.cs +++ b/TelegramBotBase/Controls/Inline/ProgressBar.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using TelegramBotBase.Base; -namespace TelegramBotBase.Controls +namespace TelegramBotBase.Controls.Inline { /// /// A simple control for show and managing progress. diff --git a/TelegramBotBase/Controls/ToggleButton.cs b/TelegramBotBase/Controls/Inline/ToggleButton.cs similarity index 98% rename from TelegramBotBase/Controls/ToggleButton.cs rename to TelegramBotBase/Controls/Inline/ToggleButton.cs index dd96238..5343f7b 100644 --- a/TelegramBotBase/Controls/ToggleButton.cs +++ b/TelegramBotBase/Controls/Inline/ToggleButton.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using TelegramBotBase.Base; using TelegramBotBase.Form; -namespace TelegramBotBase.Controls +namespace TelegramBotBase.Controls.Inline { public class ToggleButton : ControlBase { diff --git a/TelegramBotBase/Controls/TreeView.cs b/TelegramBotBase/Controls/Inline/TreeView.cs similarity index 98% rename from TelegramBotBase/Controls/TreeView.cs rename to TelegramBotBase/Controls/Inline/TreeView.cs index 1c59463..65c8f4f 100644 --- a/TelegramBotBase/Controls/TreeView.cs +++ b/TelegramBotBase/Controls/Inline/TreeView.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using TelegramBotBase.Base; using TelegramBotBase.Form; -namespace TelegramBotBase.Controls +namespace TelegramBotBase.Controls.Inline { public class TreeView : ControlBase { diff --git a/TelegramBotBase/Controls/TreeViewNode.cs b/TelegramBotBase/Controls/Inline/TreeViewNode.cs similarity index 97% rename from TelegramBotBase/Controls/TreeViewNode.cs rename to TelegramBotBase/Controls/Inline/TreeViewNode.cs index 11630f4..a871aae 100644 --- a/TelegramBotBase/Controls/TreeViewNode.cs +++ b/TelegramBotBase/Controls/Inline/TreeViewNode.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace TelegramBotBase.Controls +namespace TelegramBotBase.Controls.Inline { public class TreeViewNode { diff --git a/TelegramBotBaseTest/TelegramBotBaseTest.csproj b/TelegramBotBaseTest/TelegramBotBaseTest.csproj index 2f4069c..a06a668 100644 --- a/TelegramBotBaseTest/TelegramBotBaseTest.csproj +++ b/TelegramBotBaseTest/TelegramBotBaseTest.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.0;net461 + netcoreapp3.0;net472 false Debug;Release diff --git a/TelegramBotBaseTest/Tests/Controls/ButtonGridForm.cs b/TelegramBotBaseTest/Tests/Controls/ButtonGridForm.cs index 2158621..01da851 100644 --- a/TelegramBotBaseTest/Tests/Controls/ButtonGridForm.cs +++ b/TelegramBotBaseTest/Tests/Controls/ButtonGridForm.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using TelegramBotBase.Args; using TelegramBotBase.Controls; +using TelegramBotBase.Controls.Hybrid; using TelegramBotBase.Form; namespace TelegramBotBaseTest.Tests.Controls diff --git a/TelegramBotBaseTest/Tests/Controls/ButtonGridPagingForm.cs b/TelegramBotBaseTest/Tests/Controls/ButtonGridPagingForm.cs index d7b5447..49239cd 100644 --- a/TelegramBotBaseTest/Tests/Controls/ButtonGridPagingForm.cs +++ b/TelegramBotBaseTest/Tests/Controls/ButtonGridPagingForm.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using TelegramBotBase.Args; using TelegramBotBase.Controls; +using TelegramBotBase.Controls.Hybrid; using TelegramBotBase.Form; namespace TelegramBotBaseTest.Tests.Controls diff --git a/TelegramBotBaseTest/Tests/Controls/CalendarPickerForm.cs b/TelegramBotBaseTest/Tests/Controls/CalendarPickerForm.cs index ab2d1cd..261cda8 100644 --- a/TelegramBotBaseTest/Tests/Controls/CalendarPickerForm.cs +++ b/TelegramBotBaseTest/Tests/Controls/CalendarPickerForm.cs @@ -8,6 +8,7 @@ using TelegramBotBase.Base; using TelegramBotBase.Form; using TelegramBotBase.Controls; using TelegramBotBase.Args; +using TelegramBotBase.Controls.Inline; namespace TelegramBotBaseTest.Tests.Controls { diff --git a/TelegramBotBaseTest/Tests/Controls/MonthPickerForm.cs b/TelegramBotBaseTest/Tests/Controls/MonthPickerForm.cs index f2a86c7..a5973e0 100644 --- a/TelegramBotBaseTest/Tests/Controls/MonthPickerForm.cs +++ b/TelegramBotBaseTest/Tests/Controls/MonthPickerForm.cs @@ -8,6 +8,7 @@ using TelegramBotBase.Base; using TelegramBotBase.Form; using TelegramBotBase.Controls; using TelegramBotBase.Args; +using TelegramBotBase.Controls.Inline; namespace TelegramBotBaseTest.Tests.Controls { diff --git a/TelegramBotBaseTest/Tests/Controls/ToggleButtons.cs b/TelegramBotBaseTest/Tests/Controls/ToggleButtons.cs index ba34947..55b88e9 100644 --- a/TelegramBotBaseTest/Tests/Controls/ToggleButtons.cs +++ b/TelegramBotBaseTest/Tests/Controls/ToggleButtons.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using TelegramBotBase.Args; using TelegramBotBase.Controls; +using TelegramBotBase.Controls.Inline; using TelegramBotBase.Form; namespace TelegramBotBaseTest.Tests.Controls diff --git a/TelegramBotBaseTest/Tests/Controls/TreeViewForms.cs b/TelegramBotBaseTest/Tests/Controls/TreeViewForms.cs index b083075..6c9dd41 100644 --- a/TelegramBotBaseTest/Tests/Controls/TreeViewForms.cs +++ b/TelegramBotBaseTest/Tests/Controls/TreeViewForms.cs @@ -7,6 +7,7 @@ using TelegramBotBase.Form; using TelegramBotBase.Controls; using TelegramBotBase.Base; using TelegramBotBase.Args; +using TelegramBotBase.Controls.Inline; namespace TelegramBotBaseTest.Tests.Controls { diff --git a/TelegramBotBaseTest/Tests/ProgressTest.cs b/TelegramBotBaseTest/Tests/ProgressTest.cs index de5cf9a..8b0ea16 100644 --- a/TelegramBotBaseTest/Tests/ProgressTest.cs +++ b/TelegramBotBaseTest/Tests/ProgressTest.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using TelegramBotBase.Base; +using TelegramBotBase.Controls.Inline; using TelegramBotBase.Form; namespace TelegramBotBaseTest.Tests @@ -35,41 +36,41 @@ namespace TelegramBotBaseTest.Tests if (call == null) return; - TelegramBotBase.Controls.ProgressBar Bar = null; + ProgressBar Bar = null; switch (call.Value) { case "standard": - Bar = new TelegramBotBase.Controls.ProgressBar(0, 100, TelegramBotBase.Controls.ProgressBar.eProgressStyle.standard); + Bar = new ProgressBar(0, 100, ProgressBar.eProgressStyle.standard); Bar.Device = this.Device; break; case "squares": - Bar = new TelegramBotBase.Controls.ProgressBar(0, 100, TelegramBotBase.Controls.ProgressBar.eProgressStyle.squares); + Bar = new ProgressBar(0, 100, ProgressBar.eProgressStyle.squares); Bar.Device = this.Device; break; case "circles": - Bar = new TelegramBotBase.Controls.ProgressBar(0, 100, TelegramBotBase.Controls.ProgressBar.eProgressStyle.circles); + Bar = new ProgressBar(0, 100, ProgressBar.eProgressStyle.circles); Bar.Device = this.Device; break; case "lines": - Bar = new TelegramBotBase.Controls.ProgressBar(0, 100, TelegramBotBase.Controls.ProgressBar.eProgressStyle.lines); + Bar = new ProgressBar(0, 100, ProgressBar.eProgressStyle.lines); Bar.Device = this.Device; break; case "squaredlines": - Bar = new TelegramBotBase.Controls.ProgressBar(0, 100, TelegramBotBase.Controls.ProgressBar.eProgressStyle.squaredLines); + Bar = new ProgressBar(0, 100, ProgressBar.eProgressStyle.squaredLines); Bar.Device = this.Device; break; diff --git a/TelegramBotBaseTest/Tests/TestForm.cs b/TelegramBotBaseTest/Tests/TestForm.cs index e24a556..57d5981 100644 --- a/TelegramBotBaseTest/Tests/TestForm.cs +++ b/TelegramBotBaseTest/Tests/TestForm.cs @@ -38,7 +38,6 @@ namespace TelegramBotBaseTest.Tests { case "reply": - break; diff --git a/TelegramBotBaseTest/Tests/TestForm2.cs b/TelegramBotBaseTest/Tests/TestForm2.cs index ba7bf9b..89855d8 100644 --- a/TelegramBotBaseTest/Tests/TestForm2.cs +++ b/TelegramBotBaseTest/Tests/TestForm2.cs @@ -31,7 +31,7 @@ namespace TelegramBotBaseTest.Tests { await this.Device.Send("Ciao from Form 2"); } - + @@ -118,7 +118,7 @@ namespace TelegramBotBaseTest.Tests btn.AddButtonRow(new ButtonBase("Request Prompt", CallbackData.Create("navigate", "prompt"))); - await this.Device.SendPhoto(bmp, "Test", btn); + await this.Device.SendPhoto(bmp, "Test", "", btn); }